From 272af4392415ef70b31b1385bd1766c4c79396c0 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 09:58:29 -0500
Subject: [PATCH 01/16] feat: remove fullResponse property of
 commandoperationoptions

---
 src/operations/command.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/operations/command.ts b/src/operations/command.ts
index fc8f88006f2..2464ccedd4a 100644
--- a/src/operations/command.ts
+++ b/src/operations/command.ts
@@ -36,8 +36,6 @@ export interface CommandOperationOptions
   extends OperationOptions,
     WriteConcernOptions,
     ExplainOptions {
-  /** @deprecated This option does nothing */
-  fullResponse?: boolean;
   /** Specify a read concern and level for the collection. (only MongoDB 3.2 or higher supported) */
   readConcern?: ReadConcernLike;
   /** Collation */

From 0749cfab77d87fdb93697de8072dd441826c7b25 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:29:04 -0500
Subject: [PATCH 02/16] feat: remove WriteConcernError.err()

---
 etc/notes/CHANGES_5.0.0.md | 8 ++++++++
 src/bulk/common.ts         | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/etc/notes/CHANGES_5.0.0.md b/etc/notes/CHANGES_5.0.0.md
index 5b3d272419e..a404bf53a7c 100644
--- a/etc/notes/CHANGES_5.0.0.md
+++ b/etc/notes/CHANGES_5.0.0.md
@@ -16,6 +16,14 @@ The following is a detailed collection of the changes in the major v5 release of
 
 ## Changes
 
+### WriteConcernError.err() has been removed
+
+The `err()` getter on the WriteConcernError class has been removed.  The `toJSON()` method can be in place
+of `err()`.
+
+If `mapReduce` functionality is needed, the (`mapReduce` command)[https://www.mongodb.com/docs/manual/reference/command/mapReduce/] can be
+used manually with the `Collection.runCommand` helper.
+
 ### salveOk options removed
 
 The deprecated `slaveOk` option and `slaveOk()` method on the `Collection` class have been removed. Please
diff --git a/src/bulk/common.ts b/src/bulk/common.ts
index e9f2a1fb681..5d42f112183 100644
--- a/src/bulk/common.ts
+++ b/src/bulk/common.ts
@@ -363,11 +363,6 @@ export class WriteConcernError {
     return this[kServerError].errInfo;
   }
 
-  /** @deprecated The `err` prop that contained a MongoServerError has been deprecated. */
-  get err(): WriteConcernErrorData {
-    return this[kServerError];
-  }
-
   toJSON(): WriteConcernErrorData {
     return this[kServerError];
   }

From 571b74e532a4558c94012cff91fa5d32f0bedefe Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:30:11 -0500
Subject: [PATCH 03/16] feat: remove gssapiCanonicalizeHostName

---
 src/cmap/auth/gssapi.ts            |  2 --
 src/cmap/auth/mongo_credentials.ts |  8 --------
 test/manual/kerberos.test.js       | 15 ---------------
 3 files changed, 25 deletions(-)

diff --git a/src/cmap/auth/gssapi.ts b/src/cmap/auth/gssapi.ts
index 689d6e9512d..924fbde6eee 100644
--- a/src/cmap/auth/gssapi.ts
+++ b/src/cmap/auth/gssapi.ts
@@ -26,8 +26,6 @@ export type GSSAPICanonicalizationValue =
   typeof GSSAPICanonicalizationValue[keyof typeof GSSAPICanonicalizationValue];
 
 type MechanismProperties = {
-  /** @deprecated use `CANONICALIZE_HOST_NAME` instead */
-  gssapiCanonicalizeHostName?: boolean;
   CANONICALIZE_HOST_NAME?: GSSAPICanonicalizationValue;
   SERVICE_HOST?: string;
   SERVICE_NAME?: string;
diff --git a/src/cmap/auth/mongo_credentials.ts b/src/cmap/auth/mongo_credentials.ts
index 2c964c31195..6ed987cb212 100644
--- a/src/cmap/auth/mongo_credentials.ts
+++ b/src/cmap/auth/mongo_credentials.ts
@@ -91,14 +91,6 @@ export class MongoCredentials {
       }
     }
 
-    if ('gssapiCanonicalizeHostName' in this.mechanismProperties) {
-      emitWarningOnce(
-        'gssapiCanonicalizeHostName is deprecated. Please use CANONICALIZE_HOST_NAME instead.'
-      );
-      this.mechanismProperties.CANONICALIZE_HOST_NAME =
-        this.mechanismProperties.gssapiCanonicalizeHostName;
-    }
-
     Object.freeze(this.mechanismProperties);
     Object.freeze(this);
   }
diff --git a/test/manual/kerberos.test.js b/test/manual/kerberos.test.js
index d52d6135f63..b6e8740315c 100644
--- a/test/manual/kerberos.test.js
+++ b/test/manual/kerberos.test.js
@@ -65,21 +65,6 @@ describe('Kerberos', function () {
     });
   });
 
-  it('validate that gssapiCanonicalizeHostName can be passed in', function (done) {
-    if (process.platform === 'darwin') {
-      this.test.skipReason = 'DNS does not resolve with proper CNAME record on evergreen MacOS';
-      this.skip();
-    }
-    const client = new MongoClient(
-      `${krb5Uri}&authMechanismProperties=SERVICE_NAME:mongodb,gssapiCanonicalizeHostName:true&maxPoolSize=1`
-    );
-    client.connect(function (err, client) {
-      if (err) return done(err);
-      expect(dns.resolveCname).to.be.calledOnceWith(host);
-      verifyKerberosAuthentication(client, done);
-    });
-  });
-
   context('when passing in CANONICALIZE_HOST_NAME', function () {
     beforeEach(function () {
       if (process.platform === 'darwin') {

From 157ef8d439962b327286bcc48be815c07abef2a2 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:31:02 -0500
Subject: [PATCH 04/16] feat: remove DeleteOptions.single

---
 src/operations/delete.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/operations/delete.ts b/src/operations/delete.ts
index 9887719bbda..86bf6070346 100644
--- a/src/operations/delete.ts
+++ b/src/operations/delete.ts
@@ -18,9 +18,6 @@ export interface DeleteOptions extends CommandOperationOptions, WriteConcernOpti
   hint?: string | Document;
   /** Map of parameter names and values that can be accessed using $$var (requires MongoDB 5.0). */
   let?: Document;
-
-  /** @deprecated use `removeOne` or `removeMany` to implicitly specify the limit */
-  single?: boolean;
 }
 
 /** @public */

From 4fbb8c83770939a50ecf31ff722e0c88fc9890ab Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:33:32 -0500
Subject: [PATCH 05/16] chore: remove usage of single in delete options

---
 src/operations/delete.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/operations/delete.ts b/src/operations/delete.ts
index 86bf6070346..f4234ef47c9 100644
--- a/src/operations/delete.ts
+++ b/src/operations/delete.ts
@@ -149,10 +149,6 @@ export function makeDeleteStatement(
     limit: typeof options.limit === 'number' ? options.limit : 0
   };
 
-  if (options.single === true) {
-    op.limit = 1;
-  }
-
   if (options.collation) {
     op.collation = options.collation;
   }

From b7ea756b22e4d53c89968544e8aeccba9a1d2738 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:36:49 -0500
Subject: [PATCH 06/16] feat: make ServerOptions and TopologyOptions private

---
 src/sdam/server.ts   | 2 +-
 src/sdam/topology.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sdam/server.ts b/src/sdam/server.ts
index 9cd204ebf5f..343eb55d5c2 100644
--- a/src/sdam/server.ts
+++ b/src/sdam/server.ts
@@ -75,7 +75,7 @@ const stateTransition = makeStateMachine({
 /** @internal */
 const kMonitor = Symbol('monitor');
 
-/** @public */
+/** @internal */
 export type ServerOptions = Omit<ConnectionPoolOptions, 'id' | 'generation' | 'hostAddress'> &
   MonitorOptions;
 
diff --git a/src/sdam/topology.ts b/src/sdam/topology.ts
index 261aeeac2e4..4d1f40329c9 100644
--- a/src/sdam/topology.ts
+++ b/src/sdam/topology.ts
@@ -127,7 +127,7 @@ export interface TopologyPrivate {
   detectSrvRecords: (event: SrvPollingEvent) => void;
 }
 
-/** @public */
+/** @internal */
 export interface TopologyOptions extends BSONSerializeOptions, ServerOptions {
   srvMaxHosts: number;
   srvServiceName: string;

From ae59f7811e0a89d8eebb6b2d3f9b73d8e4845330 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:38:44 -0500
Subject: [PATCH 07/16] feat: make ServerSelector internal

---
 src/sdam/server_selection.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sdam/server_selection.ts b/src/sdam/server_selection.ts
index 74bbd891892..c7c2b563cd0 100644
--- a/src/sdam/server_selection.ts
+++ b/src/sdam/server_selection.ts
@@ -11,7 +11,7 @@ const SMALLEST_MAX_STALENESS_SECONDS = 90;
 //  Minimum version to try writes on secondaries.
 export const MIN_SECONDARY_WRITE_WIRE_VERSION = 13;
 
-/** @public */
+/** @internal */
 export type ServerSelector = (
   topologyDescription: TopologyDescription,
   servers: ServerDescription[]

From 510f37357560af382856a2a783d69fe55bbe3ba7 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:39:47 -0500
Subject: [PATCH 08/16] feat: remove PipeOptions interface

---
 src/change_stream.ts | 8 --------
 src/index.ts         | 1 -
 2 files changed, 9 deletions(-)

diff --git a/src/change_stream.ts b/src/change_stream.ts
index 7056f6d9dc6..e346609e091 100644
--- a/src/change_stream.ts
+++ b/src/change_stream.ts
@@ -78,14 +78,6 @@ export type ResumeToken = unknown;
  */
 export type OperationTime = Timestamp;
 
-/**
- * @public
- * @deprecated This interface is unused and will be removed in the next major version of the driver.
- */
-export interface PipeOptions {
-  end?: boolean;
-}
-
 /**
  * Options that can be passed to a ChangeStream. Note that startAfter, resumeAfter, and startAtOperationTime are all mutually exclusive, and the server will error if more than one is specified.
  * @public
diff --git a/src/index.ts b/src/index.ts
index 46a5999072c..c99afa8948a 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -204,7 +204,6 @@ export type {
   ChangeStreamShardCollectionDocument,
   ChangeStreamUpdateDocument,
   OperationTime,
-  PipeOptions,
   ResumeOptions,
   ResumeToken,
   UpdateDescription

From 18939445b4a76b0fd8b4cb7dd5a6e6d8050af07c Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:41:10 -0500
Subject: [PATCH 09/16] feat: remove ObjectID export from driver

---
 src/index.ts                 | 8 +-------
 test/types/mongodb.test-d.ts | 1 -
 test/unit/bson.test.js       | 4 ----
 test/unit/index.test.ts      | 1 -
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index c99afa8948a..d4d79ea5689 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -36,14 +36,8 @@ export {
   ObjectId,
   Timestamp
 } from './bson';
-export { ChangeStreamCursor } from './cursor/change_stream_cursor';
-/**
- * @public
- * @deprecated Please use `ObjectId`
- */
-export const ObjectID = ObjectId;
-
 export { AnyBulkWriteOperation, BulkWriteOptions, MongoBulkWriteError } from './bulk/common';
+export { ChangeStreamCursor } from './cursor/change_stream_cursor';
 export {
   MongoAPIError,
   MongoAWSError,
diff --git a/test/types/mongodb.test-d.ts b/test/types/mongodb.test-d.ts
index c5511c9f9c9..54056e5e72a 100644
--- a/test/types/mongodb.test-d.ts
+++ b/test/types/mongodb.test-d.ts
@@ -16,7 +16,6 @@ expectDeprecated(Collection.prototype.remove);
 expectDeprecated(Collection.prototype.count);
 expectDeprecated(Collection.prototype.mapReduce);
 expectDeprecated(FindCursor.prototype.count);
-expectDeprecated(MongoDBDriver.ObjectID);
 expectNotDeprecated(MongoDBDriver.ObjectId);
 
 declare const options: MongoDBDriver.MongoClientOptions;
diff --git a/test/unit/bson.test.js b/test/unit/bson.test.js
index 92f90231729..05267f0ed5d 100644
--- a/test/unit/bson.test.js
+++ b/test/unit/bson.test.js
@@ -84,8 +84,4 @@ describe('MongoDB export', () => {
   const mongodb = require('../../src');
   it('should include ObjectId', () =>
     expect(mongodb).to.have.property('ObjectId').that.is.a('function'));
-  it('should include ObjectID', () =>
-    expect(mongodb).to.have.property('ObjectID').that.is.a('function'));
-  it('should have ObjectID and ObjectId equal each other', () =>
-    expect(mongodb.ObjectId).to.equal(mongodb.ObjectID));
 });
diff --git a/test/unit/index.test.ts b/test/unit/index.test.ts
index 115a2363293..197aaad6896 100644
--- a/test/unit/index.test.ts
+++ b/test/unit/index.test.ts
@@ -99,7 +99,6 @@ const EXPECTED_EXPORTS = [
   'MongoUnexpectedServerResponseError',
   'MongoWriteConcernError',
   'ObjectId',
-  'ObjectID',
   'OrderedBulkOperation',
   'ProfilingLevel',
   'ReadConcern',

From 78987962f8f850a5cf0a07e23f288c525d5b07b2 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:43:47 -0500
Subject: [PATCH 10/16] feat: remove Projection and ProjectionOperations types

---
 src/index.ts                                    |  2 --
 src/mongo_types.ts                              | 14 --------------
 test/types/community/collection/findX.test-d.ts |  5 +----
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index d4d79ea5689..d81a4646e73 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -332,8 +332,6 @@ export type {
   OnlyFieldsOfType,
   OptionalId,
   OptionalUnlessRequiredId,
-  Projection,
-  ProjectionOperators,
   PropertyType,
   PullAllOperator,
   PullOperator,
diff --git a/src/mongo_types.ts b/src/mongo_types.ts
index f4dcc28e1d1..2408d7a88f4 100644
--- a/src/mongo_types.ts
+++ b/src/mongo_types.ts
@@ -192,20 +192,6 @@ export type BSONType = typeof BSONType[keyof typeof BSONType];
 /** @public */
 export type BSONTypeAlias = keyof typeof BSONType;
 
-/**
- * @public
- * Projection is flexible to permit the wide array of aggregation operators
- * @deprecated since v4.1.0: Since projections support all aggregation operations we have no plans to narrow this type further
- */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export type Projection<TSchema extends Document = Document> = Document;
-
-/**
- * @public
- * @deprecated since v4.1.0: Since projections support all aggregation operations we have no plans to narrow this type further
- */
-export type ProjectionOperators = Document;
-
 /** @public */
 export type IsAny<Type, ResultIfAny, ResultIfNotAny> = true extends false & Type
   ? ResultIfAny
diff --git a/test/types/community/collection/findX.test-d.ts b/test/types/community/collection/findX.test-d.ts
index 733e1c83d37..e0ccd4eb92d 100644
--- a/test/types/community/collection/findX.test-d.ts
+++ b/test/types/community/collection/findX.test-d.ts
@@ -1,6 +1,6 @@
 import { expectAssignable, expectNotType, expectType } from 'tsd';
 
-import type { Filter, Projection, ProjectionOperators } from '../../../../src';
+import type { Filter } from '../../../../src';
 import {
   Collection,
   Db,
@@ -231,9 +231,6 @@ colorCollection.find<{ color: string }>({ color: { $in: ['regularArray'] } });
 // This is a regression test that we don't remove the unused generic in FindOptions
 const findOptions: FindOptions<{ a: number }> = {};
 expectType<FindOptions>(findOptions);
-// This is just to check that we still export these type symbols
-expectAssignable<Projection>({});
-expectAssignable<ProjectionOperators>({});
 
 // Ensure users can create a custom Db type that only contains specific
 // collections (which are, in turn, strongly typed):

From fa65ee327148ac093a234e0d2c0a160ffa5cef8a Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:49:43 -0500
Subject: [PATCH 11/16] feat: remove BulkWriteOptions.keepGoing

---
 src/bulk/common.ts | 2 --
 src/collection.ts  | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/src/bulk/common.ts b/src/bulk/common.ts
index 5d42f112183..86ad050a9cd 100644
--- a/src/bulk/common.ts
+++ b/src/bulk/common.ts
@@ -871,8 +871,6 @@ export interface BulkWriteOptions extends CommandOperationOptions {
   bypassDocumentValidation?: boolean;
   /** If true, when an insert fails, don't execute the remaining writes. If false, continue with remaining inserts when one fails. */
   ordered?: boolean;
-  /** @deprecated use `ordered` instead */
-  keepGoing?: boolean;
   /** Force server to assign _id values instead of driver. */
   forceServerObjectId?: boolean;
   /** Map of parameter names and values that can be accessed using $$var (requires MongoDB 5.0). */
diff --git a/src/collection.ts b/src/collection.ts
index fb02e21101c..5897587dd77 100644
--- a/src/collection.ts
+++ b/src/collection.ts
@@ -1652,10 +1652,6 @@ export class Collection<TSchema extends Document = Document> {
     options = options || { ordered: false };
     docs = !Array.isArray(docs) ? [docs] : docs;
 
-    if (options.keepGoing === true) {
-      options.ordered = false;
-    }
-
     return this.insertMany(docs, options, callback);
   }
 

From 3ff6eef5a686369ded317ba193837b7e29a2a7b4 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:52:58 -0500
Subject: [PATCH 12/16] feat: remove AddUserOptions.digestPassword

---
 src/operations/add_user.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/operations/add_user.ts b/src/operations/add_user.ts
index 3d0c08e79e1..dceb3d25650 100644
--- a/src/operations/add_user.ts
+++ b/src/operations/add_user.ts
@@ -22,8 +22,6 @@ export interface RoleSpecification {
 
 /** @public */
 export interface AddUserOptions extends CommandOperationOptions {
-  /** @deprecated Please use db.command('createUser', ...) instead for this option */
-  digestPassword?: null;
   /** Roles associated with the created user */
   roles?: string | string[] | RoleSpecification | RoleSpecification[];
   /** Custom data associated with the user (only Mongodb 2.6 or higher) */
@@ -57,7 +55,9 @@ export class AddUserOperation extends CommandOperation<Document> {
     const options = this.options;
 
     // Error out if digestPassword set
-    if (options.digestPassword != null) {
+    // v5 removed the digestPassword option from AddUserOptions but we still want to throw
+    // an error when digestPassword is provided.
+    if ((options as any).digestPassword != null) {
       return callback(
         new MongoInvalidArgumentError(
           'Option "digestPassword" not supported via addUser, use db.command(...) instead'

From b98e02918ae7c027490d1a2df8817583afd9bf55 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Jan 2023 11:55:04 -0500
Subject: [PATCH 13/16] docs: add upgrade guide

---
 etc/notes/CHANGES_5.0.0.md                    | 45 ++++++++++++++++--
 src/cmap/auth/mongo_credentials.ts            |  1 -
 src/index.ts                                  |  1 -
 test/integration/crud/crud_api.test.ts        | 16 +------
 test/integration/crud/remove.test.js          | 46 -------------------
 .../node-specific/operation_example.test.js   |  2 +-
 .../operation_promises_example.test.js        |  2 +-
 7 files changed, 43 insertions(+), 70 deletions(-)

diff --git a/etc/notes/CHANGES_5.0.0.md b/etc/notes/CHANGES_5.0.0.md
index a404bf53a7c..79f5a4910e9 100644
--- a/etc/notes/CHANGES_5.0.0.md
+++ b/etc/notes/CHANGES_5.0.0.md
@@ -16,15 +16,50 @@ The following is a detailed collection of the changes in the major v5 release of
 
 ## Changes
 
-### WriteConcernError.err() has been removed
+### `AddUserOptions.digestPassword` removed
+
+The `digestPassword` option has been removed from the add user helper.
+
+### Removal of Internal Types from Public API
+
+The following types are used internally the driver but were accidentally exported.  They have now been
+marked internal and are no longer exported.
+
+- ServerSelector
+- PipeOptions
+- ServerOptions
+
+### `DeleteOptions.single` Option Removed
+
+TODO - merge in Neal's removal of `collection.remove` and combine notes
+
+### Remove of `ObjectID` Type in Favor Of `ObjectId`
+
+`ObjectID` was exported for legacy reasons and has been removed.  Please use `ObjectId` instead.
+
+### Kerberos Option `gssapiCanonicalizeHostName` Removed
+
+`gssapiCanonicalizeHostName` has been removed in favor of the `CANONICALIZE_HOST_NAME` value.
+
+### `Projection` and `ProjectionOperations` Types Removed
+
+Both of these types were unused but exported.  These types have been removed.  Please
+use `Document` instead.
+
+### `CommandOperationOptions.fullResponse` Option Removed
+
+The `fullResponse` option on the `CommandOperationOptions` as unused in the driver and has been removed.
+
+### `BulkWriteOptions.keepGoing` Option Removed
+
+The `keepGoing` option on the `BulkWriteOptions` has been removed.  Please use the `ordered` option instead.
+
+### `WriteConcernError.err()` Removed
 
 The `err()` getter on the WriteConcernError class has been removed.  The `toJSON()` method can be in place
 of `err()`.
 
-If `mapReduce` functionality is needed, the (`mapReduce` command)[https://www.mongodb.com/docs/manual/reference/command/mapReduce/] can be
-used manually with the `Collection.runCommand` helper.
-
-### salveOk options removed
+### slaveOk options removed
 
 The deprecated `slaveOk` option and `slaveOk()` method on the `Collection` class have been removed. Please
 now use `secondaryOk` as the replacement for the option and the method.
diff --git a/src/cmap/auth/mongo_credentials.ts b/src/cmap/auth/mongo_credentials.ts
index 6ed987cb212..fa461006f9a 100644
--- a/src/cmap/auth/mongo_credentials.ts
+++ b/src/cmap/auth/mongo_credentials.ts
@@ -1,7 +1,6 @@
 // Resolves the default auth mechanism according to
 import type { Document } from '../../bson';
 import { MongoAPIError, MongoMissingCredentialsError } from '../../error';
-import { emitWarningOnce } from '../../utils';
 import { GSSAPICanonicalizationValue } from './gssapi';
 import { AUTH_MECHS_AUTH_SRC_EXTERNAL, AuthMechanism } from './providers';
 
diff --git a/src/index.ts b/src/index.ts
index d81a4646e73..f355b50269e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,4 @@
 import { Admin } from './admin';
-import { ObjectId } from './bson';
 import { OrderedBulkOperation } from './bulk/ordered';
 import { UnorderedBulkOperation } from './bulk/unordered';
 import { ChangeStream } from './change_stream';
diff --git a/test/integration/crud/crud_api.test.ts b/test/integration/crud/crud_api.test.ts
index 032c5ac3102..d5e077faca1 100644
--- a/test/integration/crud/crud_api.test.ts
+++ b/test/integration/crud/crud_api.test.ts
@@ -670,21 +670,7 @@ describe('CRUD API', function () {
         // Legacy update method
         // -------------------------------------------------
         const legacyRemove = function () {
-          db.collection('t4_1').insertMany(
-            [{ a: 1 }, { a: 1 }],
-            { writeConcern: { w: 1 } },
-            function (err, r) {
-              expect(err).to.not.exist;
-              test.equal(2, r.insertedCount);
-
-              db.collection('t4_1').remove({ a: 1 }, { single: true }, function (err, r) {
-                expect(err).to.not.exist;
-                test.equal(1, r.deletedCount);
-
-                deleteOne();
-              });
-            }
-          );
+          deleteOne();
         };
 
         //
diff --git a/test/integration/crud/remove.test.js b/test/integration/crud/remove.test.js
index 9283f0c5d97..04ad2275f21 100644
--- a/test/integration/crud/remove.test.js
+++ b/test/integration/crud/remove.test.js
@@ -107,52 +107,6 @@ describe('Remove', function () {
     }
   });
 
-  it('should correctly remove only first document', {
-    metadata: {
-      requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] }
-    },
-
-    test: function (done) {
-      const self = this;
-      const client = self.configuration.newClient(self.configuration.writeConcernMax(), {
-        maxPoolSize: 1
-      });
-
-      client.connect(function (err, client) {
-        const db = client.db(self.configuration.db);
-        expect(err).to.not.exist;
-
-        db.createCollection('shouldCorrectlyRemoveOnlyFirstDocument', function (err) {
-          expect(err).to.not.exist;
-
-          const collection = db.collection('shouldCorrectlyRemoveOnlyFirstDocument');
-
-          collection.insert(
-            [{ a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }],
-            { writeConcern: { w: 1 } },
-            function (err) {
-              expect(err).to.not.exist;
-
-              // Remove the first
-              collection.remove(
-                { a: 1 },
-                { writeConcern: { w: 1 }, single: true },
-                function (err, r) {
-                  expect(r).property('deletedCount').to.equal(1);
-
-                  collection.find({ a: 1 }).count(function (err, result) {
-                    expect(result).to.equal(3);
-                    client.close(done);
-                  });
-                }
-              );
-            }
-          );
-        });
-      });
-    }
-  });
-
   it('should not error on empty remove', {
     metadata: {
       requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] }
diff --git a/test/integration/node-specific/operation_example.test.js b/test/integration/node-specific/operation_example.test.js
index 8709ae2de05..aa6a6701752 100644
--- a/test/integration/node-specific/operation_example.test.js
+++ b/test/integration/node-specific/operation_example.test.js
@@ -2541,7 +2541,7 @@ describe('Operation Examples', function () {
                   { name: 'Sarah', title: 'Princess' },
                   { name: 'Gump', title: 'Gump' }
                 ],
-                { writeConcern: { w: 1 }, keepGoing: true },
+                { writeConcern: { w: 1 }, ordered: false },
                 function (err, result) {
                   expect(result).to.not.exist;
                   test.ok(err);
diff --git a/test/integration/node-specific/operation_promises_example.test.js b/test/integration/node-specific/operation_promises_example.test.js
index 161d33d6801..e7431265dde 100644
--- a/test/integration/node-specific/operation_promises_example.test.js
+++ b/test/integration/node-specific/operation_promises_example.test.js
@@ -1854,7 +1854,7 @@ describe('Operation (Promises)', function () {
                 { name: 'Sarah', title: 'Princess' },
                 { name: 'Gump', title: 'Gump' }
               ],
-              { writeConcern: { w: 1 }, keepGoing: true }
+              { writeConcern: { w: 1 }, ordered: false }
             );
           })
           .catch(function () {

From d175098e1c31ccad9475da0af7d111e4b76b670b Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Thu, 5 Jan 2023 09:56:28 -0500
Subject: [PATCH 14/16] Update etc/notes/CHANGES_5.0.0.md

Co-authored-by: Neal Beeken <neal.beeken@mongodb.com>
---
 etc/notes/CHANGES_5.0.0.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/notes/CHANGES_5.0.0.md b/etc/notes/CHANGES_5.0.0.md
index 79f5a4910e9..11fb49d7a50 100644
--- a/etc/notes/CHANGES_5.0.0.md
+++ b/etc/notes/CHANGES_5.0.0.md
@@ -35,7 +35,7 @@ TODO - merge in Neal's removal of `collection.remove` and combine notes
 
 ### Remove of `ObjectID` Type in Favor Of `ObjectId`
 
-`ObjectID` was exported for legacy reasons and has been removed.  Please use `ObjectId` instead.
+For clarity the deprecated and duplicate export ObjectID has been removed. ObjectId matches the class name and is equal in every way to the capital "D" export.
 
 ### Kerberos Option `gssapiCanonicalizeHostName` Removed
 

From 2ee7912a6729d3ca33bef7870358f4d03db798c2 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Thu, 5 Jan 2023 10:12:21 -0500
Subject: [PATCH 15/16] chore: bump TS and TSD to latest, use 4.9.0 narrowing
 in add user

---
 package-lock.json          | 210 ++++++++++++++++++-------------------
 package.json               |   6 +-
 src/operations/add_user.ts |   2 +-
 3 files changed, 108 insertions(+), 110 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dc943029957..76d9aaf138f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@aws-sdk/credential-providers": "^3.201.0",
         "@iarna/toml": "^2.2.5",
         "@istanbuljs/nyc-config-typescript": "^1.0.2",
-        "@microsoft/api-extractor": "^7.33.3",
+        "@microsoft/api-extractor": "^7.33.7",
         "@microsoft/tsdoc-config": "^0.16.2",
         "@mongodb-js/zstd": "^1.0.0",
         "@types/chai": "^4.3.3",
@@ -56,8 +56,8 @@
         "source-map-support": "^0.5.21",
         "standard-version": "^9.5.0",
         "ts-node": "^10.9.1",
-        "tsd": "^0.24.1",
-        "typescript": "^4.8.4",
+        "tsd": "^0.25.0",
+        "typescript": "^4.9.0",
         "typescript-cached-transpile": "^0.0.6",
         "xml2js": "^0.4.23",
         "yargs": "^17.6.0"
@@ -1815,17 +1815,17 @@
       }
     },
     "node_modules/@microsoft/api-extractor": {
-      "version": "7.33.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.33.4.tgz",
-      "integrity": "sha512-uZG4CHxVcQNpXBC77GwHaKFwGI9vAnzORY4fFN5JuTnQQDKS0vi4BazP4pmYYwbb8IdH4ocQSwOA3j9Ul/sWmg==",
+      "version": "7.33.7",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.33.7.tgz",
+      "integrity": "sha512-fQT2v/j/55DhvMFiopLtth66E7xTFNhnumMKgKY14SaG6qU/V1W0e4nOAgbA+SmLakQjAd1Evu06ofaVaxBPbA==",
       "dev": true,
       "dependencies": {
-        "@microsoft/api-extractor-model": "7.25.1",
-        "@microsoft/tsdoc": "0.14.1",
+        "@microsoft/api-extractor-model": "7.25.3",
+        "@microsoft/tsdoc": "0.14.2",
         "@microsoft/tsdoc-config": "~0.16.1",
-        "@rushstack/node-core-library": "3.53.2",
+        "@rushstack/node-core-library": "3.53.3",
         "@rushstack/rig-package": "0.3.17",
-        "@rushstack/ts-command-line": "4.13.0",
+        "@rushstack/ts-command-line": "4.13.1",
         "colors": "~1.2.1",
         "lodash": "~4.17.15",
         "resolve": "~1.17.0",
@@ -1838,20 +1838,33 @@
       }
     },
     "node_modules/@microsoft/api-extractor-model": {
-      "version": "7.25.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.25.1.tgz",
-      "integrity": "sha512-AaZ0ohCGLRjWiZviM+0p/DaxgMhbawS183LW2+CSqyEBh6wZks7NjoyhzhibAYapS4omnrmv96+0V/2wBvnIZQ==",
+      "version": "7.25.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.25.3.tgz",
+      "integrity": "sha512-WWxBUq77p2iZ+5VF7Nmrm3y/UtqCh5bYV8ii3khwq3w99+fXWpvfsAhgSLsC7k8XDQc6De4ssMxH6He/qe1pzg==",
       "dev": true,
       "dependencies": {
-        "@microsoft/tsdoc": "0.14.1",
+        "@microsoft/tsdoc": "0.14.2",
         "@microsoft/tsdoc-config": "~0.16.1",
-        "@rushstack/node-core-library": "3.53.2"
+        "@rushstack/node-core-library": "3.53.3"
+      }
+    },
+    "node_modules/@microsoft/api-extractor/node_modules/typescript": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
       }
     },
     "node_modules/@microsoft/tsdoc": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz",
-      "integrity": "sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz",
+      "integrity": "sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==",
       "dev": true
     },
     "node_modules/@microsoft/tsdoc-config": {
@@ -1866,12 +1879,6 @@
         "resolve": "~1.19.0"
       }
     },
-    "node_modules/@microsoft/tsdoc-config/node_modules/@microsoft/tsdoc": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz",
-      "integrity": "sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==",
-      "dev": true
-    },
     "node_modules/@microsoft/tsdoc-config/node_modules/resolve": {
       "version": "1.19.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
@@ -2225,9 +2232,9 @@
       }
     },
     "node_modules/@rushstack/node-core-library": {
-      "version": "3.53.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.53.2.tgz",
-      "integrity": "sha512-FggLe5DQs0X9MNFeJN3/EXwb+8hyZUTEp2i+V1e8r4Va4JgkjBNY0BuEaQI+3DW6S4apV3UtXU3im17MSY00DA==",
+      "version": "3.53.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.53.3.tgz",
+      "integrity": "sha512-H0+T5koi5MFhJUd5ND3dI3bwLhvlABetARl78L3lWftJVQEPyzcgTStvTTRiIM5mCltyTM8VYm6BuCtNUuxD0Q==",
       "dev": true,
       "dependencies": {
         "@types/node": "12.20.24",
@@ -2257,9 +2264,9 @@
       }
     },
     "node_modules/@rushstack/ts-command-line": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.0.tgz",
-      "integrity": "sha512-crLT31kl+qilz0eBRjqqYO06CqwbElc0EvzS6jI69B9Ikt1SkkSzIZ2iDP7zt/rd1ZYipKIS9hf9CQR9swDIKg==",
+      "version": "4.13.1",
+      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.1.tgz",
+      "integrity": "sha512-UTQMRyy/jH1IS2U+6pyzyn9xQ2iMcoUKkTcZUzOP/aaMiKlWLwCTDiBVwhw/M1crDx6apF9CwyjuWO9r1SBdJQ==",
       "dev": true,
       "dependencies": {
         "@types/argparse": "1.0.38",
@@ -2328,9 +2335,9 @@
       "dev": true
     },
     "node_modules/@tsd/typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/@tsd/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-WMFNVstwWGyDuZP2LGPRZ+kPHxZLmhO+2ormstDvnXiyoBPtW1qq9XhhrkI4NVtxgs+2ZiUTl9AG7nNIRq/uCg==",
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/@tsd/typescript/-/typescript-4.9.4.tgz",
+      "integrity": "sha512-70j1vy95LsMvciXWJLrQ9pQaaG1inJJ+gZ/dW/bPdzHUH1VTeSl3BBU6QxqFWh5IjPy6s7xHcUw45R71dw4J3w==",
       "dev": true
     },
     "node_modules/@types/argparse": {
@@ -3389,11 +3396,14 @@
       }
     },
     "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
+      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
     },
     "node_modules/commondir": {
       "version": "1.0.1",
@@ -4427,12 +4437,6 @@
         "@microsoft/tsdoc-config": "0.16.2"
       }
     },
-    "node_modules/eslint-plugin-tsdoc/node_modules/@microsoft/tsdoc": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz",
-      "integrity": "sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==",
-      "dev": true
-    },
     "node_modules/eslint-rule-docs": {
       "version": "1.1.235",
       "resolved": "https://registry.npmjs.org/eslint-rule-docs/-/eslint-rule-docs-1.1.235.tgz",
@@ -8782,12 +8786,12 @@
       }
     },
     "node_modules/tsd": {
-      "version": "0.24.1",
-      "resolved": "https://registry.npmjs.org/tsd/-/tsd-0.24.1.tgz",
-      "integrity": "sha512-sD+s81/2aM4RRhimCDttd4xpBNbUFWnoMSHk/o8kC8Ek23jljeRNWjsxFJmOmYLuLTN9swRt1b6iXfUXTcTiIA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/tsd/-/tsd-0.25.0.tgz",
+      "integrity": "sha512-liUlvKtsdr+70XEZP/kkF6U8+Q9URZi4Pw58ih7a9x3kjJblG8rdVgvG62xcvkgRva1q3yWX5qAxfYZuYiC5CA==",
       "dev": true,
       "dependencies": {
-        "@tsd/typescript": "~4.8.3",
+        "@tsd/typescript": "~4.9.3",
         "eslint-formatter-pretty": "^4.1.0",
         "globby": "^11.0.1",
         "meow": "^9.0.0",
@@ -9075,9 +9079,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
+      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -9531,9 +9535,9 @@
       }
     },
     "node_modules/z-schema": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.4.tgz",
-      "integrity": "sha512-gm/lx3hDzJNcLwseIeQVm1UcwhWIKpSB4NqH89pTBtFns4k/HDHudsICtvG05Bvw/Mv3jMyk700y5dadueLHdA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.5.tgz",
+      "integrity": "sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==",
       "dev": true,
       "dependencies": {
         "lodash.get": "^4.4.2",
@@ -9547,7 +9551,7 @@
         "node": ">=8.0.0"
       },
       "optionalDependencies": {
-        "commander": "^2.20.3"
+        "commander": "^9.4.1"
       }
     }
   },
@@ -10973,40 +10977,48 @@
       }
     },
     "@microsoft/api-extractor": {
-      "version": "7.33.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.33.4.tgz",
-      "integrity": "sha512-uZG4CHxVcQNpXBC77GwHaKFwGI9vAnzORY4fFN5JuTnQQDKS0vi4BazP4pmYYwbb8IdH4ocQSwOA3j9Ul/sWmg==",
+      "version": "7.33.7",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.33.7.tgz",
+      "integrity": "sha512-fQT2v/j/55DhvMFiopLtth66E7xTFNhnumMKgKY14SaG6qU/V1W0e4nOAgbA+SmLakQjAd1Evu06ofaVaxBPbA==",
       "dev": true,
       "requires": {
-        "@microsoft/api-extractor-model": "7.25.1",
-        "@microsoft/tsdoc": "0.14.1",
+        "@microsoft/api-extractor-model": "7.25.3",
+        "@microsoft/tsdoc": "0.14.2",
         "@microsoft/tsdoc-config": "~0.16.1",
-        "@rushstack/node-core-library": "3.53.2",
+        "@rushstack/node-core-library": "3.53.3",
         "@rushstack/rig-package": "0.3.17",
-        "@rushstack/ts-command-line": "4.13.0",
+        "@rushstack/ts-command-line": "4.13.1",
         "colors": "~1.2.1",
         "lodash": "~4.17.15",
         "resolve": "~1.17.0",
         "semver": "~7.3.0",
         "source-map": "~0.6.1",
         "typescript": "~4.8.4"
+      },
+      "dependencies": {
+        "typescript": {
+          "version": "4.8.4",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+          "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+          "dev": true
+        }
       }
     },
     "@microsoft/api-extractor-model": {
-      "version": "7.25.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.25.1.tgz",
-      "integrity": "sha512-AaZ0ohCGLRjWiZviM+0p/DaxgMhbawS183LW2+CSqyEBh6wZks7NjoyhzhibAYapS4omnrmv96+0V/2wBvnIZQ==",
+      "version": "7.25.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.25.3.tgz",
+      "integrity": "sha512-WWxBUq77p2iZ+5VF7Nmrm3y/UtqCh5bYV8ii3khwq3w99+fXWpvfsAhgSLsC7k8XDQc6De4ssMxH6He/qe1pzg==",
       "dev": true,
       "requires": {
-        "@microsoft/tsdoc": "0.14.1",
+        "@microsoft/tsdoc": "0.14.2",
         "@microsoft/tsdoc-config": "~0.16.1",
-        "@rushstack/node-core-library": "3.53.2"
+        "@rushstack/node-core-library": "3.53.3"
       }
     },
     "@microsoft/tsdoc": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz",
-      "integrity": "sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz",
+      "integrity": "sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==",
       "dev": true
     },
     "@microsoft/tsdoc-config": {
@@ -11021,12 +11033,6 @@
         "resolve": "~1.19.0"
       },
       "dependencies": {
-        "@microsoft/tsdoc": {
-          "version": "0.14.2",
-          "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz",
-          "integrity": "sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==",
-          "dev": true
-        },
         "resolve": {
           "version": "1.19.0",
           "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
@@ -11205,9 +11211,9 @@
       }
     },
     "@rushstack/node-core-library": {
-      "version": "3.53.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.53.2.tgz",
-      "integrity": "sha512-FggLe5DQs0X9MNFeJN3/EXwb+8hyZUTEp2i+V1e8r4Va4JgkjBNY0BuEaQI+3DW6S4apV3UtXU3im17MSY00DA==",
+      "version": "3.53.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.53.3.tgz",
+      "integrity": "sha512-H0+T5koi5MFhJUd5ND3dI3bwLhvlABetARl78L3lWftJVQEPyzcgTStvTTRiIM5mCltyTM8VYm6BuCtNUuxD0Q==",
       "dev": true,
       "requires": {
         "@types/node": "12.20.24",
@@ -11239,9 +11245,9 @@
       }
     },
     "@rushstack/ts-command-line": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.0.tgz",
-      "integrity": "sha512-crLT31kl+qilz0eBRjqqYO06CqwbElc0EvzS6jI69B9Ikt1SkkSzIZ2iDP7zt/rd1ZYipKIS9hf9CQR9swDIKg==",
+      "version": "4.13.1",
+      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.1.tgz",
+      "integrity": "sha512-UTQMRyy/jH1IS2U+6pyzyn9xQ2iMcoUKkTcZUzOP/aaMiKlWLwCTDiBVwhw/M1crDx6apF9CwyjuWO9r1SBdJQ==",
       "dev": true,
       "requires": {
         "@types/argparse": "1.0.38",
@@ -11310,9 +11316,9 @@
       "dev": true
     },
     "@tsd/typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/@tsd/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-WMFNVstwWGyDuZP2LGPRZ+kPHxZLmhO+2ormstDvnXiyoBPtW1qq9XhhrkI4NVtxgs+2ZiUTl9AG7nNIRq/uCg==",
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/@tsd/typescript/-/typescript-4.9.4.tgz",
+      "integrity": "sha512-70j1vy95LsMvciXWJLrQ9pQaaG1inJJ+gZ/dW/bPdzHUH1VTeSl3BBU6QxqFWh5IjPy6s7xHcUw45R71dw4J3w==",
       "dev": true
     },
     "@types/argparse": {
@@ -12087,9 +12093,9 @@
       "dev": true
     },
     "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
+      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==",
       "dev": true,
       "optional": true
     },
@@ -12907,14 +12913,6 @@
       "requires": {
         "@microsoft/tsdoc": "0.14.2",
         "@microsoft/tsdoc-config": "0.16.2"
-      },
-      "dependencies": {
-        "@microsoft/tsdoc": {
-          "version": "0.14.2",
-          "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz",
-          "integrity": "sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==",
-          "dev": true
-        }
       }
     },
     "eslint-rule-docs": {
@@ -16177,12 +16175,12 @@
       }
     },
     "tsd": {
-      "version": "0.24.1",
-      "resolved": "https://registry.npmjs.org/tsd/-/tsd-0.24.1.tgz",
-      "integrity": "sha512-sD+s81/2aM4RRhimCDttd4xpBNbUFWnoMSHk/o8kC8Ek23jljeRNWjsxFJmOmYLuLTN9swRt1b6iXfUXTcTiIA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/tsd/-/tsd-0.25.0.tgz",
+      "integrity": "sha512-liUlvKtsdr+70XEZP/kkF6U8+Q9URZi4Pw58ih7a9x3kjJblG8rdVgvG62xcvkgRva1q3yWX5qAxfYZuYiC5CA==",
       "dev": true,
       "requires": {
-        "@tsd/typescript": "~4.8.3",
+        "@tsd/typescript": "~4.9.3",
         "eslint-formatter-pretty": "^4.1.0",
         "globby": "^11.0.1",
         "meow": "^9.0.0",
@@ -16400,9 +16398,9 @@
       }
     },
     "typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
+      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
       "dev": true
     },
     "typescript-cached-transpile": {
@@ -16734,12 +16732,12 @@
       "dev": true
     },
     "z-schema": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.4.tgz",
-      "integrity": "sha512-gm/lx3hDzJNcLwseIeQVm1UcwhWIKpSB4NqH89pTBtFns4k/HDHudsICtvG05Bvw/Mv3jMyk700y5dadueLHdA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.5.tgz",
+      "integrity": "sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==",
       "dev": true,
       "requires": {
-        "commander": "^2.20.3",
+        "commander": "^9.4.1",
         "lodash.get": "^4.4.2",
         "lodash.isequal": "^4.5.0",
         "validator": "^13.7.0"
diff --git a/package.json b/package.json
index 0f7c84f6b73..53bf290eb59 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "@aws-sdk/credential-providers": "^3.201.0",
     "@iarna/toml": "^2.2.5",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@microsoft/api-extractor": "^7.33.3",
+    "@microsoft/api-extractor": "^7.33.7",
     "@microsoft/tsdoc-config": "^0.16.2",
     "@mongodb-js/zstd": "^1.0.0",
     "@types/chai": "^4.3.3",
@@ -87,8 +87,8 @@
     "source-map-support": "^0.5.21",
     "standard-version": "^9.5.0",
     "ts-node": "^10.9.1",
-    "tsd": "^0.24.1",
-    "typescript": "^4.8.4",
+    "tsd": "^0.25.0",
+    "typescript": "^4.9.0",
     "typescript-cached-transpile": "^0.0.6",
     "xml2js": "^0.4.23",
     "yargs": "^17.6.0"
diff --git a/src/operations/add_user.ts b/src/operations/add_user.ts
index dceb3d25650..be5982a42f6 100644
--- a/src/operations/add_user.ts
+++ b/src/operations/add_user.ts
@@ -57,7 +57,7 @@ export class AddUserOperation extends CommandOperation<Document> {
     // Error out if digestPassword set
     // v5 removed the digestPassword option from AddUserOptions but we still want to throw
     // an error when digestPassword is provided.
-    if ((options as any).digestPassword != null) {
+    if ('digestPassword' in options && options.digestPassword != null) {
       return callback(
         new MongoInvalidArgumentError(
           'Option "digestPassword" not supported via addUser, use db.command(...) instead'

From 07daf19d2fc2e1f8d8e70169d187a01d87b47550 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Thu, 5 Jan 2023 11:20:26 -0500
Subject: [PATCH 16/16] chore: bump remaining tooling

---
 package-lock.json | 287 +++++++++++++++++++++++++---------------------
 package.json      |   8 +-
 2 files changed, 163 insertions(+), 132 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 76d9aaf138f..c4c3caac4e1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,12 +31,12 @@
         "@types/sinon": "^10.0.13",
         "@types/sinon-chai": "^3.2.8",
         "@types/whatwg-url": "^11.0.0",
-        "@typescript-eslint/eslint-plugin": "^5.40.0",
-        "@typescript-eslint/parser": "^5.40.0",
+        "@typescript-eslint/eslint-plugin": "^5.48.0",
+        "@typescript-eslint/parser": "^5.48.0",
         "chai": "^4.3.6",
         "chai-subset": "^1.6.0",
         "chalk": "^4.1.2",
-        "eslint": "^8.25.0",
+        "eslint": "^8.31.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-prettier": "^4.2.1",
@@ -57,7 +57,7 @@
         "standard-version": "^9.5.0",
         "ts-node": "^10.9.1",
         "tsd": "^0.25.0",
-        "typescript": "^4.9.0",
+        "typescript": "^4.9.4",
         "typescript-cached-transpile": "^0.0.6",
         "xml2js": "^0.4.23",
         "yargs": "^17.6.0"
@@ -1583,15 +1583,15 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
+      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
         "espree": "^9.4.0",
-        "globals": "^13.15.0",
+        "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -1606,14 +1606,14 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
-      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "minimatch": "^3.0.5"
       },
       "engines": {
         "node": ">=10.10.0"
@@ -2540,16 +2540,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.1.tgz",
-      "integrity": "sha512-FsWboKkWdytGiXT5O1/R9j37YgcjO8MKHSUmWnIEjVaz0krHkplPnYi7mwdb+5+cs0toFNQb0HIrN7zONdIEWg==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.48.0.tgz",
+      "integrity": "sha512-SVLafp0NXpoJY7ut6VFVUU9I+YeFsDzeQwtK0WZ+xbRN3mtxJ08je+6Oi2N89qDn087COdO0u3blKZNv9VetRQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.40.1",
-        "@typescript-eslint/type-utils": "5.40.1",
-        "@typescript-eslint/utils": "5.40.1",
+        "@typescript-eslint/scope-manager": "5.48.0",
+        "@typescript-eslint/type-utils": "5.48.0",
+        "@typescript-eslint/utils": "5.48.0",
         "debug": "^4.3.4",
         "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
         "regexpp": "^3.2.0",
         "semver": "^7.3.7",
         "tsutils": "^3.21.0"
@@ -2572,14 +2573,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.40.1.tgz",
-      "integrity": "sha512-IK6x55va5w4YvXd4b3VrXQPldV9vQTxi5ov+g4pMANsXPTXOcfjx08CRR1Dfrcc51syPtXHF5bgLlMHYFrvQtg==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.48.0.tgz",
+      "integrity": "sha512-1mxNA8qfgxX8kBvRDIHEzrRGrKHQfQlbW6iHyfHYS0Q4X1af+S6mkLNtgCOsGVl8+/LUPrqdHMssAemkrQ01qg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.40.1",
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/typescript-estree": "5.40.1",
+        "@typescript-eslint/scope-manager": "5.48.0",
+        "@typescript-eslint/types": "5.48.0",
+        "@typescript-eslint/typescript-estree": "5.48.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2599,13 +2600,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.40.1.tgz",
-      "integrity": "sha512-jkn4xsJiUQucI16OLCXrLRXDZ3afKhOIqXs4R3O+M00hdQLKR58WuyXPZZjhKLFCEP2g+TXdBRtLQ33UfAdRUg==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.0.tgz",
+      "integrity": "sha512-0AA4LviDtVtZqlyUQnZMVHydDATpD9SAX/RC5qh6cBd3xmyWvmXYF+WT1oOmxkeMnWDlUVTwdODeucUnjz3gow==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/visitor-keys": "5.40.1"
+        "@typescript-eslint/types": "5.48.0",
+        "@typescript-eslint/visitor-keys": "5.48.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2616,13 +2617,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.40.1.tgz",
-      "integrity": "sha512-DLAs+AHQOe6n5LRraXiv27IYPhleF0ldEmx6yBqBgBLaNRKTkffhV1RPsjoJBhVup2zHxfaRtan8/YRBgYhU9Q==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.0.tgz",
+      "integrity": "sha512-vbtPO5sJyFjtHkGlGK4Sthmta0Bbls4Onv0bEqOGm7hP9h8UpRsHJwsrCiWtCUndTRNQO/qe6Ijz9rnT/DB+7g==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.40.1",
-        "@typescript-eslint/utils": "5.40.1",
+        "@typescript-eslint/typescript-estree": "5.48.0",
+        "@typescript-eslint/utils": "5.48.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -2643,9 +2644,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.40.1.tgz",
-      "integrity": "sha512-Icg9kiuVJSwdzSQvtdGspOlWNjVDnF3qVIKXdJ103o36yRprdl3Ge5cABQx+csx960nuMF21v8qvO31v9t3OHw==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.0.tgz",
+      "integrity": "sha512-UTe67B0Ypius0fnEE518NB2N8gGutIlTojeTg4nt0GQvikReVkurqxd2LvYa9q9M5MQ6rtpNyWTBxdscw40Xhw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2656,13 +2657,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.1.tgz",
-      "integrity": "sha512-5QTP/nW5+60jBcEPfXy/EZL01qrl9GZtbgDZtDPlfW5zj/zjNrdI2B5zMUHmOsfvOr2cWqwVdWjobCiHcedmQA==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.0.tgz",
+      "integrity": "sha512-7pjd94vvIjI1zTz6aq/5wwE/YrfIyEPLtGJmRfyNR9NYIW+rOvzzUv3Cmq2hRKpvt6e9vpvPUQ7puzX7VSmsEw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/visitor-keys": "5.40.1",
+        "@typescript-eslint/types": "5.48.0",
+        "@typescript-eslint/visitor-keys": "5.48.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -2683,16 +2684,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.40.1.tgz",
-      "integrity": "sha512-a2TAVScoX9fjryNrW6BZRnreDUszxqm9eQ9Esv8n5nXApMW0zeANUYlwh/DED04SC/ifuBvXgZpIK5xeJHQ3aw==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.0.tgz",
+      "integrity": "sha512-x2jrMcPaMfsHRRIkL+x96++xdzvrdBCnYRd5QiW5Wgo1OB4kDYPbC1XjWP/TNqlfK93K/lUL92erq5zPLgFScQ==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.40.1",
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/typescript-estree": "5.40.1",
+        "@typescript-eslint/scope-manager": "5.48.0",
+        "@typescript-eslint/types": "5.48.0",
+        "@typescript-eslint/typescript-estree": "5.48.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0",
         "semver": "^7.3.7"
@@ -2709,12 +2710,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.1.tgz",
-      "integrity": "sha512-A2DGmeZ+FMja0geX5rww+DpvILpwo1OsiQs0M+joPWJYsiEFBLsH0y1oFymPNul6Z5okSmHpP4ivkc2N0Cgfkw==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.0.tgz",
+      "integrity": "sha512-5motVPz5EgxQ0bHjut3chzBkJ3Z3sheYVcSwS5BpHZpLqSptSmELNtGixmgj65+rIfhvtQTz5i9OP2vtzdDH7Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.40.1",
+        "@typescript-eslint/types": "5.48.0",
         "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
@@ -4176,14 +4177,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.25.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
-      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
+      "version": "8.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz",
+      "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.10.5",
+        "@eslint/eslintrc": "^1.4.1",
+        "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -4199,14 +4201,14 @@
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "globby": "^11.1.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
         "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
@@ -4515,9 +4517,9 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.8.0",
@@ -5259,9 +5261,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "version": "13.19.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
+      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -5783,6 +5785,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -6854,6 +6865,12 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
     "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -10804,15 +10821,15 @@
       }
     },
     "@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
+      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
         "espree": "^9.4.0",
-        "globals": "^13.15.0",
+        "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -10821,14 +10838,14 @@
       }
     },
     "@humanwhocodes/config-array": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
-      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "minimatch": "^3.0.5"
       }
     },
     "@humanwhocodes/module-importer": {
@@ -11521,69 +11538,70 @@
       }
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.1.tgz",
-      "integrity": "sha512-FsWboKkWdytGiXT5O1/R9j37YgcjO8MKHSUmWnIEjVaz0krHkplPnYi7mwdb+5+cs0toFNQb0HIrN7zONdIEWg==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.48.0.tgz",
+      "integrity": "sha512-SVLafp0NXpoJY7ut6VFVUU9I+YeFsDzeQwtK0WZ+xbRN3mtxJ08je+6Oi2N89qDn087COdO0u3blKZNv9VetRQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.40.1",
-        "@typescript-eslint/type-utils": "5.40.1",
-        "@typescript-eslint/utils": "5.40.1",
+        "@typescript-eslint/scope-manager": "5.48.0",
+        "@typescript-eslint/type-utils": "5.48.0",
+        "@typescript-eslint/utils": "5.48.0",
         "debug": "^4.3.4",
         "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
         "regexpp": "^3.2.0",
         "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.40.1.tgz",
-      "integrity": "sha512-IK6x55va5w4YvXd4b3VrXQPldV9vQTxi5ov+g4pMANsXPTXOcfjx08CRR1Dfrcc51syPtXHF5bgLlMHYFrvQtg==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.48.0.tgz",
+      "integrity": "sha512-1mxNA8qfgxX8kBvRDIHEzrRGrKHQfQlbW6iHyfHYS0Q4X1af+S6mkLNtgCOsGVl8+/LUPrqdHMssAemkrQ01qg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.40.1",
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/typescript-estree": "5.40.1",
+        "@typescript-eslint/scope-manager": "5.48.0",
+        "@typescript-eslint/types": "5.48.0",
+        "@typescript-eslint/typescript-estree": "5.48.0",
         "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.40.1.tgz",
-      "integrity": "sha512-jkn4xsJiUQucI16OLCXrLRXDZ3afKhOIqXs4R3O+M00hdQLKR58WuyXPZZjhKLFCEP2g+TXdBRtLQ33UfAdRUg==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.0.tgz",
+      "integrity": "sha512-0AA4LviDtVtZqlyUQnZMVHydDATpD9SAX/RC5qh6cBd3xmyWvmXYF+WT1oOmxkeMnWDlUVTwdODeucUnjz3gow==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/visitor-keys": "5.40.1"
+        "@typescript-eslint/types": "5.48.0",
+        "@typescript-eslint/visitor-keys": "5.48.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.40.1.tgz",
-      "integrity": "sha512-DLAs+AHQOe6n5LRraXiv27IYPhleF0ldEmx6yBqBgBLaNRKTkffhV1RPsjoJBhVup2zHxfaRtan8/YRBgYhU9Q==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.0.tgz",
+      "integrity": "sha512-vbtPO5sJyFjtHkGlGK4Sthmta0Bbls4Onv0bEqOGm7hP9h8UpRsHJwsrCiWtCUndTRNQO/qe6Ijz9rnT/DB+7g==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.40.1",
-        "@typescript-eslint/utils": "5.40.1",
+        "@typescript-eslint/typescript-estree": "5.48.0",
+        "@typescript-eslint/utils": "5.48.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.40.1.tgz",
-      "integrity": "sha512-Icg9kiuVJSwdzSQvtdGspOlWNjVDnF3qVIKXdJ103o36yRprdl3Ge5cABQx+csx960nuMF21v8qvO31v9t3OHw==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.0.tgz",
+      "integrity": "sha512-UTe67B0Ypius0fnEE518NB2N8gGutIlTojeTg4nt0GQvikReVkurqxd2LvYa9q9M5MQ6rtpNyWTBxdscw40Xhw==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.1.tgz",
-      "integrity": "sha512-5QTP/nW5+60jBcEPfXy/EZL01qrl9GZtbgDZtDPlfW5zj/zjNrdI2B5zMUHmOsfvOr2cWqwVdWjobCiHcedmQA==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.0.tgz",
+      "integrity": "sha512-7pjd94vvIjI1zTz6aq/5wwE/YrfIyEPLtGJmRfyNR9NYIW+rOvzzUv3Cmq2hRKpvt6e9vpvPUQ7puzX7VSmsEw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/visitor-keys": "5.40.1",
+        "@typescript-eslint/types": "5.48.0",
+        "@typescript-eslint/visitor-keys": "5.48.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -11592,28 +11610,28 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.40.1.tgz",
-      "integrity": "sha512-a2TAVScoX9fjryNrW6BZRnreDUszxqm9eQ9Esv8n5nXApMW0zeANUYlwh/DED04SC/ifuBvXgZpIK5xeJHQ3aw==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.0.tgz",
+      "integrity": "sha512-x2jrMcPaMfsHRRIkL+x96++xdzvrdBCnYRd5QiW5Wgo1OB4kDYPbC1XjWP/TNqlfK93K/lUL92erq5zPLgFScQ==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.40.1",
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/typescript-estree": "5.40.1",
+        "@typescript-eslint/scope-manager": "5.48.0",
+        "@typescript-eslint/types": "5.48.0",
+        "@typescript-eslint/typescript-estree": "5.48.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0",
         "semver": "^7.3.7"
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.1.tgz",
-      "integrity": "sha512-A2DGmeZ+FMja0geX5rww+DpvILpwo1OsiQs0M+joPWJYsiEFBLsH0y1oFymPNul6Z5okSmHpP4ivkc2N0Cgfkw==",
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.0.tgz",
+      "integrity": "sha512-5motVPz5EgxQ0bHjut3chzBkJ3Z3sheYVcSwS5BpHZpLqSptSmELNtGixmgj65+rIfhvtQTz5i9OP2vtzdDH7Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.40.1",
+        "@typescript-eslint/types": "5.48.0",
         "eslint-visitor-keys": "^3.3.0"
       }
     },
@@ -12693,14 +12711,15 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.25.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
-      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
+      "version": "8.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz",
+      "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.10.5",
+        "@eslint/eslintrc": "^1.4.1",
+        "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -12716,14 +12735,14 @@
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "globby": "^11.1.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
         "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
@@ -12955,9 +12974,9 @@
       "dev": true
     },
     "espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
       "dev": true,
       "requires": {
         "acorn": "^8.8.0",
@@ -13530,9 +13549,9 @@
       }
     },
     "globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "version": "13.19.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
+      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
       "dev": true,
       "requires": {
         "type-fest": "^0.20.2"
@@ -13890,6 +13909,12 @@
       "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
       "dev": true
     },
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true
+    },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -14710,6 +14735,12 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
+    "natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
     "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
diff --git a/package.json b/package.json
index 53bf290eb59..ad6927e6d62 100644
--- a/package.json
+++ b/package.json
@@ -62,12 +62,12 @@
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.8",
     "@types/whatwg-url": "^11.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.40.0",
-    "@typescript-eslint/parser": "^5.40.0",
+    "@typescript-eslint/eslint-plugin": "^5.48.0",
+    "@typescript-eslint/parser": "^5.48.0",
     "chai": "^4.3.6",
     "chai-subset": "^1.6.0",
     "chalk": "^4.1.2",
-    "eslint": "^8.25.0",
+    "eslint": "^8.31.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.2.1",
@@ -88,7 +88,7 @@
     "standard-version": "^9.5.0",
     "ts-node": "^10.9.1",
     "tsd": "^0.25.0",
-    "typescript": "^4.9.0",
+    "typescript": "^4.9.4",
     "typescript-cached-transpile": "^0.0.6",
     "xml2js": "^0.4.23",
     "yargs": "^17.6.0"