mongodb 4.3.1 → 4.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "4.3.1",
+  "version": "4.5.0",
   "description": "The official MongoDB driver for Node.js",
   "main": "lib/index.js",
   "files": [
@@ -8,16 +8,9 @@
     "src",
     "etc/prepare.js",
     "mongodb.d.ts",
-    "mongodb.ts34.d.ts"
+    "tsconfig.json"
   ],
   "types": "mongodb.d.ts",
-  "typesVersions": {
-    "<=4.0.2": {
-      "mongodb.d.ts": [
-        "mongodb.ts34.d.ts"
-      ]
-    }
-  },
   "repository": {
     "type": "git",
     "url": "git@github.com:mongodb/node-mongodb-native.git"
@@ -32,55 +25,57 @@
     "email": "dbx-node@mongodb.com"
   },
   "dependencies": {
-    "bson": "^4.6.1",
+    "bson": "^4.6.2",
     "denque": "^2.0.1",
-    "mongodb-connection-string-url": "^2.4.1",
-    "socks": "^2.6.1"
+    "mongodb-connection-string-url": "^2.5.2",
+    "socks": "^2.6.2"
   },
   "devDependencies": {
+    "@iarna/toml": "^2.2.5",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@microsoft/api-extractor": "^7.19.4",
+    "@microsoft/api-extractor": "^7.20.0",
     "@microsoft/tsdoc-config": "^0.15.2",
     "@types/chai": "^4.3.0",
     "@types/chai-subset": "^1.3.3",
+    "@types/express": "^4.17.13",
     "@types/kerberos": "^1.1.1",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^17.0.10",
+    "@types/mocha": "^9.1.0",
+    "@types/node": "^17.0.23",
     "@types/saslprep": "^1.0.1",
     "@types/semver": "^7.3.9",
-    "@types/sinon": "^10.0.6",
+    "@types/sinon": "^10.0.11",
     "@types/whatwg-url": "^8.2.1",
-    "@typescript-eslint/eslint-plugin": "^5.10.0",
-    "@typescript-eslint/parser": "^5.10.0",
+    "@typescript-eslint/eslint-plugin": "^5.17.0",
+    "@typescript-eslint/parser": "^5.17.0",
     "bluebird": "^3.7.2",
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "chai-subset": "^1.6.0",
     "chalk": "^4.1.2",
-    "downlevel-dts": "^0.8.0",
-    "eslint": "^8.7.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint": "^8.12.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "eslint-plugin-tsdoc": "^0.2.14",
+    "express": "^4.17.3",
     "js-yaml": "^4.1.0",
     "lodash.camelcase": "^4.3.0",
-    "mocha": "^9.1.4",
+    "mocha": "^9.2.2",
     "mocha-sinon": "^2.1.2",
     "nyc": "^15.1.0",
-    "prettier": "^2.5.1",
+    "prettier": "^2.6.1",
     "rimraf": "^3.0.2",
     "semver": "^7.3.5",
-    "sinon": "^12.0.1",
+    "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.21",
     "standard-version": "^9.3.2",
-    "ts-node": "^10.4.0",
-    "tsd": "^0.19.1",
-    "typescript": "^4.5.4",
+    "ts-node": "^10.7.0",
+    "tsd": "^0.20.0",
+    "typescript": "^4.6.3",
     "typescript-cached-transpile": "^0.0.6",
     "xml2js": "^0.4.23",
-    "yargs": "^17.3.1"
+    "yargs": "^17.4.0"
   },
   "license": "Apache-2.0",
   "engines": {
@@ -95,32 +90,37 @@
   },
   "scripts": {
     "build:evergreen": "node .evergreen/generate_evergreen_tasks.js",
-    "build:ts": "rimraf lib && ./node_modules/typescript/bin/tsc",
-    "build:dts": "npm run build:ts && api-extractor run && rimraf 'lib/**/*.d.ts*' && downlevel-dts mongodb.d.ts mongodb.ts34.d.ts",
-    "build:docs": "typedoc",
+    "build:ts": "node ./node_modules/typescript/bin/tsc",
+    "build:dts": "npm run build:ts && api-extractor run && rimraf 'lib/**/*.d.ts*'",
+    "build:docs": "./etc/docs/build.ts",
+    "build:typedoc": "typedoc",
     "check:bench": "node test/benchmarks/driverBench",
     "check:coverage": "nyc npm run test:all",
+    "check:integration-coverage": "nyc npm run check:test",
     "check:lint": "npm run build:dts && npm run check:dts && npm run check:eslint && npm run check:tsd",
     "check:eslint": "eslint -v && eslint --max-warnings=0 --ext '.js,.ts' src test",
     "check:tsd": "tsd --version && tsd",
-    "check:dts": "./node_modules/typescript/bin/tsc --noEmit mongodb.d.ts && tsd",
-    "check:test": "mocha --file test/tools/runner test/integration",
-    "check:unit": "mocha test/unit/",
-    "check:ts": "./node_modules/typescript/bin/tsc -v && ./node_modules/typescript/bin/tsc --noEmit",
-    "check:atlas": "mocha --config \"test/manual/mocharc.json\" test/manual/atlas_connectivity.test.js",
-    "check:adl": "mocha --file test/tools/runner test/manual/data_lake.test.js",
-    "check:aws": "mocha --file test/tools/runner test/integration/auth/mongodb_aws.test.js",
-    "check:ocsp": "mocha --config \"test/manual/mocharc.json\" test/manual/ocsp_support.test.js",
-    "check:kerberos": "mocha --config \"test/manual/mocharc.json\" test/manual/kerberos.test.js",
-    "check:tls": "mocha --config \"test/manual/mocharc.json\" test/manual/tls_support.test.js",
-    "check:ldap": "mocha --config \"test/manual/mocharc.json\" test/manual/ldap.test.js",
-    "check:socks5": "mocha --config \"test/manual/mocharc.json\" test/manual/socks5.test.ts",
-    "check:csfle": "mocha --file test/tools/runner test/integration/client-side-encryption",
+    "check:dts": "node ./node_modules/typescript/bin/tsc --noEmit mongodb.d.ts && tsd",
+    "check:test": "mocha --config test/mocha_mongodb.json test/integration",
+    "check:unit": "mocha test/unit",
+    "check:ts": "node ./node_modules/typescript/bin/tsc -v && node ./node_modules/typescript/bin/tsc --noEmit",
+    "check:atlas": "mocha --config test/manual/mocharc.json test/manual/atlas_connectivity.test.js",
+    "check:adl": "mocha --config test/mocha_mongodb.json test/manual/atlas-data-lake-testing",
+    "check:aws": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_aws.test.js",
+    "check:ocsp": "mocha --config test/manual/mocharc.json test/manual/ocsp_support.test.js",
+    "check:kerberos": "mocha --config test/manual/mocharc.json test/manual/kerberos.test.js",
+    "check:tls": "mocha --config test/manual/mocharc.json test/manual/tls_support.test.js",
+    "check:ldap": "mocha --config test/manual/mocharc.json test/manual/ldap.test.js",
+    "check:socks5": "mocha --config test/manual/mocharc.json test/manual/socks5.test.ts",
+    "check:csfle": "mocha --config test/mocha_mongodb.json test/integration/client-side-encryption",
     "check:snappy": "mocha test/unit/assorted/snappy.test.js",
+    "fix:eslint": "npm run check:eslint -- --fix",
     "prepare": "node etc/prepare.js",
+    "preview:docs": "ts-node etc/docs/preview.ts",
     "release": "standard-version -i HISTORY.md",
     "test": "npm run check:lint && npm run test:all",
-    "test:all": "npm run check:unit && npm run check:test"
+    "test:all": "npm run check:unit && npm run check:test",
+    "update:docs": "npm run build:docs -- --yes"
   },
   "tsd": {
     "directory": "test/types",

package/src/admin.ts

@@ -14,7 +14,7 @@ import {
   ValidateCollectionOperation,
   ValidateCollectionOptions
 } from './operations/validate_collection';
-import { Callback, getTopology } from './utils';
+import type { Callback } from './utils';
 
 /** @internal */
 export interface AdminPrivate {
@@ -83,7 +83,7 @@ export class Admin {
     options = Object.assign({ dbName: 'admin' }, options);
 
     return executeOperation(
-      getTopology(this.s.db),
+      this.s.db,
       new RunCommandOperation(this.s.db, command, options),
       callback
     );
@@ -207,7 +207,7 @@ export class Admin {
     options = Object.assign({ dbName: 'admin' }, options);
 
     return executeOperation(
-      getTopology(this.s.db),
+      this.s.db,
       new AddUserOperation(this.s.db, username, password, options),
       callback
     );
@@ -233,7 +233,7 @@ export class Admin {
     options = Object.assign({ dbName: 'admin' }, options);
 
     return executeOperation(
-      getTopology(this.s.db),
+      this.s.db,
       new RemoveUserOperation(this.s.db, username, options),
       callback
     );
@@ -263,7 +263,7 @@ export class Admin {
     options = options ?? {};
 
     return executeOperation(
-      getTopology(this.s.db),
+      this.s.db,
       new ValidateCollectionOperation(this, collectionName, options),
       callback
     );
@@ -286,11 +286,7 @@ export class Admin {
     if (typeof options === 'function') (callback = options), (options = {});
     options = options ?? {};
 
-    return executeOperation(
-      getTopology(this.s.db),
-      new ListDatabasesOperation(this.s.db, options),
-      callback
-    );
+    return executeOperation(this.s.db, new ListDatabasesOperation(this.s.db, options), callback);
   }
 
   /**

package/src/bulk/common.ts

@@ -20,14 +20,15 @@ import type { CollationOptions, CommandOperationOptions } from '../operations/co
 import { DeleteOperation, DeleteStatement, makeDeleteStatement } from '../operations/delete';
 import { executeOperation } from '../operations/execute_operation';
 import { InsertOperation } from '../operations/insert';
-import type { Hint } from '../operations/operation';
+import { AbstractOperation, Hint } from '../operations/operation';
 import { makeUpdateStatement, UpdateOperation, UpdateStatement } from '../operations/update';
 import { PromiseProvider } from '../promise_provider';
+import type { Server } from '../sdam/server';
 import type { Topology } from '../sdam/topology';
+import type { ClientSession } from '../sessions';
 import {
   applyRetryableWrites,
   Callback,
-  executeLegacyOperation,
   getTopology,
   hasAtomicOperators,
   MongoDBNamespace,
@@ -286,9 +287,7 @@ export class BulkWriteResult {
 
   /** Returns a specific write error object */
   getWriteErrorAt(index: number): WriteError | undefined {
-    if (index < this.result.writeErrors.length) {
-      return this.result.writeErrors[index];
-    }
+    return index < this.result.writeErrors.length ? this.result.writeErrors[index] : undefined;
   }
 
   /** Retrieve all write errors */
@@ -656,19 +655,19 @@ function executeCommands(
   try {
     if (isInsertBatch(batch)) {
       executeOperation(
-        bulkOperation.s.topology,
+        bulkOperation.s.collection,
         new InsertOperation(bulkOperation.s.namespace, batch.operations, finalOptions),
         resultHandler
       );
     } else if (isUpdateBatch(batch)) {
       executeOperation(
-        bulkOperation.s.topology,
+        bulkOperation.s.collection,
         new UpdateOperation(bulkOperation.s.namespace, batch.operations, finalOptions),
         resultHandler
       );
     } else if (isDeleteBatch(batch)) {
       executeOperation(
-        bulkOperation.s.topology,
+        bulkOperation.s.collection,
         new DeleteOperation(bulkOperation.s.namespace, batch.operations, finalOptions),
         resultHandler
       );
@@ -732,7 +731,7 @@ export class MongoBulkWriteError extends MongoServerError {
     Object.assign(this, error);
   }
 
-  get name(): string {
+  override get name(): string {
     return 'MongoBulkWriteError';
   }
 
@@ -921,6 +920,34 @@ export interface BulkWriteOptions extends CommandOperationOptions {
   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). */
+  let?: Document;
+}
+
+/**
+ * TODO(NODE-4063)
+ * BulkWrites merge complexity is implemented in executeCommands
+ * This provides a vehicle to treat bulkOperations like any other operation (hence "shim")
+ * We would like this logic to simply live inside the BulkWriteOperation class
+ * @internal
+ */
+class BulkWriteShimOperation extends AbstractOperation {
+  bulkOperation: BulkOperationBase;
+  constructor(bulkOperation: BulkOperationBase, options: BulkWriteOptions) {
+    super(options);
+    this.bulkOperation = bulkOperation;
+  }
+
+  execute(server: Server, session: ClientSession | undefined, callback: Callback<any>): void {
+    if (this.options.session == null) {
+      // An implicit session could have been created by 'executeOperation'
+      // So if we stick it on finalOptions here, each bulk operation
+      // will use this same session, it'll be passed in the same way
+      // an explicit session would be
+      this.options.session = session;
+    }
+    return executeCommands(this.bulkOperation, this.options, callback);
+  }
 }
 
 /** @public */
@@ -1256,17 +1283,16 @@ export abstract class BulkOperationBase {
 
     this.s.executed = true;
     const finalOptions = { ...this.s.options, ...options };
-    return executeLegacyOperation(this.s.topology, executeCommands, [this, finalOptions, callback]);
+    const operation = new BulkWriteShimOperation(this, finalOptions);
+
+    return executeOperation(this.s.collection, operation, callback);
   }
 
   /**
    * Handles the write error before executing commands
    * @internal
    */
-  handleWriteError(
-    callback: Callback<BulkWriteResult>,
-    writeResult: BulkWriteResult
-  ): boolean | undefined {
+  handleWriteError(callback: Callback<BulkWriteResult>, writeResult: BulkWriteResult): boolean {
     if (this.s.bulkResult.writeErrors.length > 0) {
       const msg = this.s.bulkResult.writeErrors[0].errmsg
         ? this.s.bulkResult.writeErrors[0].errmsg
@@ -1291,6 +1317,8 @@ export abstract class BulkOperationBase {
       callback(new MongoBulkWriteError(writeConcernError, writeResult));
       return true;
     }
+
+    return false;
   }
 
   abstract addToOperationsList(

package/src/bulk/unordered.ts

@@ -13,7 +13,7 @@ export class UnorderedBulkOperation extends BulkOperationBase {
     super(collection, options, false);
   }
 
-  handleWriteError(callback: Callback, writeResult: BulkWriteResult): boolean | undefined {
+  override handleWriteError(callback: Callback, writeResult: BulkWriteResult): boolean {
     if (this.s.batches.length) {
       return false;
     }

package/src/change_stream.ts

@@ -45,10 +45,21 @@ const kClosed = Symbol('closed');
 /** @internal */
 const kMode = Symbol('mode');
 
-const CHANGE_STREAM_OPTIONS = ['resumeAfter', 'startAfter', 'startAtOperationTime', 'fullDocument'];
-const CURSOR_OPTIONS = ['batchSize', 'maxAwaitTimeMS', 'collation', 'readPreference'].concat(
-  CHANGE_STREAM_OPTIONS
-);
+const CHANGE_STREAM_OPTIONS = [
+  'resumeAfter',
+  'startAfter',
+  'startAtOperationTime',
+  'fullDocument'
+] as const;
+
+const CURSOR_OPTIONS = [
+  'batchSize',
+  'maxAwaitTimeMS',
+  'collation',
+  'readPreference',
+  'comment',
+  ...CHANGE_STREAM_OPTIONS
+] as const;
 
 const CHANGE_DOMAIN_TYPES = {
   COLLECTION: Symbol('Collection'),
@@ -68,6 +79,8 @@ export interface ResumeOptions {
   maxAwaitTimeMS?: number;
   collation?: CollationOptions;
   readPreference?: ReadPreference;
+  resumeAfter?: ResumeToken;
+  startAfter?: ResumeToken;
 }
 
 /**
@@ -94,7 +107,7 @@ export interface PipeOptions {
  * @public
  */
 export interface ChangeStreamOptions extends AggregateOptions {
-  /** Allowed values: ‘default’, ‘updateLookup’. When set to ‘updateLookup’, the change stream will include both a delta describing the changes to the document, as well as a copy of the entire document that was changed from some time after the change occurred. */
+  /** Allowed values: 'updateLookup'. When set to 'updateLookup', the change stream will include both a delta describing the changes to the document, as well as a copy of the entire document that was changed from some time after the change occurred. */
   fullDocument?: string;
   /** The maximum amount of time for the server to wait on new documents to satisfy a change stream query. */
   maxAwaitTimeMS?: number;
@@ -144,7 +157,7 @@ export interface ChangeStreamDocument<TSchema extends Document = Document> {
    * this will contain all the components of the shard key in order,
    * followed by the _id if the _id isn’t part of the shard key.
    */
-  documentKey?: InferIdType<TSchema>;
+  documentKey?: { _id: InferIdType<TSchema> };
 
   /**
    * Only present for ops of type ‘update’.
@@ -398,7 +411,7 @@ export class ChangeStream<TSchema extends Document = Document> extends TypedEven
 export interface ChangeStreamCursorOptions extends AbstractCursorOptions {
   startAtOperationTime?: OperationTime;
   resumeAfter?: ResumeToken;
-  startAfter?: boolean;
+  startAfter?: ResumeToken;
 }
 
 /** @internal */
@@ -446,22 +459,18 @@ export class ChangeStreamCursor<TSchema extends Document = Document> extends Abs
   }
 
   get resumeOptions(): ResumeOptions {
-    const result = {} as ResumeOptions;
-    for (const optionName of CURSOR_OPTIONS) {
-      if (Reflect.has(this.options, optionName)) {
-        Reflect.set(result, optionName, Reflect.get(this.options, optionName));
-      }
-    }
+    const result: ResumeOptions = applyKnownOptions(this.options, CURSOR_OPTIONS);
 
     if (this.resumeToken || this.startAtOperationTime) {
-      ['resumeAfter', 'startAfter', 'startAtOperationTime'].forEach(key =>
-        Reflect.deleteProperty(result, key)
-      );
+      for (const key of ['resumeAfter', 'startAfter', 'startAtOperationTime']) {
+        Reflect.deleteProperty(result, key);
+      }
 
       if (this.resumeToken) {
         const resumeKey =
           this.options.startAfter && !this.hasReceived ? 'startAfter' : 'resumeAfter';
-        Reflect.set(result, resumeKey, this.resumeToken);
+
+        result[resumeKey] = this.resumeToken;
       } else if (this.startAtOperationTime && maxWireVersion(this.server) >= 7) {
         result.startAtOperationTime = this.startAtOperationTime;
       }
@@ -503,7 +512,7 @@ export class ChangeStreamCursor<TSchema extends Document = Document> extends Abs
       session
     });
 
-    executeOperation(this.topology, aggregateOperation, (err, response) => {
+    executeOperation(session, aggregateOperation, (err, response) => {
       if (err || response == null) {
         return callback(err);
       }
@@ -528,7 +537,7 @@ export class ChangeStreamCursor<TSchema extends Document = Document> extends Abs
     });
   }
 
-  _getMore(batchSize: number, callback: Callback): void {
+  override _getMore(batchSize: number, callback: Callback): void {
     super._getMore(batchSize, (err, response) => {
       if (err) {
         return callback(err);
@@ -549,7 +558,7 @@ const CHANGE_STREAM_EVENTS = [
   ChangeStream.CLOSE
 ];
 
-function setIsEmitter<TSchema>(changeStream: ChangeStream<TSchema>): void {
+function setIsEmitter<TSchema extends Document>(changeStream: ChangeStream<TSchema>): void {
   if (changeStream[kMode] === 'iterator') {
     // TODO(NODE-3485): Replace with MongoChangeStreamModeError
     throw new MongoAPIError(
@@ -559,7 +568,7 @@ function setIsEmitter<TSchema>(changeStream: ChangeStream<TSchema>): void {
   changeStream[kMode] = 'emitter';
 }
 
-function setIsIterator<TSchema>(changeStream: ChangeStream<TSchema>): void {
+function setIsIterator<TSchema extends Document>(changeStream: ChangeStream<TSchema>): void {
   if (changeStream[kMode] === 'emitter') {
     // TODO(NODE-3485): Replace with MongoChangeStreamModeError
     throw new MongoAPIError(
@@ -568,25 +577,25 @@ function setIsIterator<TSchema>(changeStream: ChangeStream<TSchema>): void {
   }
   changeStream[kMode] = 'iterator';
 }
+
 /**
  * Create a new change stream cursor based on self's configuration
  * @internal
  */
-function createChangeStreamCursor<TSchema>(
+function createChangeStreamCursor<TSchema extends Document>(
   changeStream: ChangeStream<TSchema>,
-  options: ChangeStreamOptions
+  options: ChangeStreamOptions | ResumeOptions
 ): ChangeStreamCursor<TSchema> {
-  const changeStreamStageOptions: Document = { fullDocument: options.fullDocument || 'default' };
-  applyKnownOptions(changeStreamStageOptions, options, CHANGE_STREAM_OPTIONS);
+  const changeStreamStageOptions = applyKnownOptions(options, CHANGE_STREAM_OPTIONS);
   if (changeStream.type === CHANGE_DOMAIN_TYPES.CLUSTER) {
     changeStreamStageOptions.allChangesForCluster = true;
   }
-
   const pipeline = [{ $changeStream: changeStreamStageOptions } as Document].concat(
     changeStream.pipeline
   );
 
-  const cursorOptions = applyKnownOptions({}, options, CURSOR_OPTIONS);
+  const cursorOptions: ChangeStreamCursorOptions = applyKnownOptions(options, CURSOR_OPTIONS);
+
   const changeStreamCursor = new ChangeStreamCursor<TSchema>(
     getTopology(changeStream.parent),
     changeStream.namespace,
@@ -605,16 +614,17 @@ function createChangeStreamCursor<TSchema>(
   return changeStreamCursor;
 }
 
-function applyKnownOptions(target: Document, source: Document, optionNames: string[]) {
-  optionNames.forEach(name => {
-    if (source[name]) {
-      target[name] = source[name];
+function applyKnownOptions(source: Document, options: ReadonlyArray<string>) {
+  const result: Document = {};
+
+  for (const option of options) {
+    if (option in source) {
+      result[option] = source[option];
     }
-  });
+  }
 
-  return target;
+  return result;
 }
-
 interface TopologyWaitOptions {
   start?: number;
   timeout?: number;
@@ -648,8 +658,8 @@ function waitForTopologyConnected(
   }, 500); // this is an arbitrary wait time to allow SDAM to transition
 }
 
-function closeWithError<T>(
-  changeStream: ChangeStream<T>,
+function closeWithError<TSchema extends Document>(
+  changeStream: ChangeStream<TSchema>,
   error: AnyError,
   callback?: Callback
 ): void {
@@ -660,7 +670,7 @@ function closeWithError<T>(
   changeStream.close(() => callback && callback(error));
 }
 
-function streamEvents<TSchema>(
+function streamEvents<TSchema extends Document>(
   changeStream: ChangeStream<TSchema>,
   cursor: ChangeStreamCursor<TSchema>
 ): void {
@@ -671,7 +681,7 @@ function streamEvents<TSchema>(
   stream.on('error', error => processError(changeStream, error));
 }
 
-function endStream<TSchema>(changeStream: ChangeStream<TSchema>): void {
+function endStream<TSchema extends Document>(changeStream: ChangeStream<TSchema>): void {
   const cursorStream = changeStream[kCursorStream];
   if (cursorStream) {
     ['data', 'close', 'end', 'error'].forEach(event => cursorStream.removeAllListeners(event));
@@ -681,7 +691,7 @@ function endStream<TSchema>(changeStream: ChangeStream<TSchema>): void {
   changeStream[kCursorStream] = undefined;
 }
 
-function processNewChange<TSchema>(
+function processNewChange<TSchema extends Document>(
   changeStream: ChangeStream<TSchema>,
   change: Nullable<ChangeStreamDocument<TSchema>>,
   callback?: Callback<ChangeStreamDocument<TSchema>>
@@ -718,7 +728,7 @@ function processNewChange<TSchema>(
   return callback(undefined, change);
 }
 
-function processError<TSchema>(
+function processError<TSchema extends Document>(
   changeStream: ChangeStream<TSchema>,
   error: AnyError,
   callback?: Callback
@@ -786,7 +796,10 @@ function processError<TSchema>(
  *
  * @param changeStream - the parent ChangeStream
  */
-function getCursor<T>(changeStream: ChangeStream<T>, callback: Callback<ChangeStreamCursor<T>>) {
+function getCursor<T extends Document>(
+  changeStream: ChangeStream<T>,
+  callback: Callback<ChangeStreamCursor<T>>
+) {
   if (changeStream[kClosed]) {
     // TODO(NODE-3485): Replace with MongoChangeStreamClosedError
     callback(new MongoAPIError(CHANGESTREAM_CLOSED_ERROR));
@@ -809,7 +822,10 @@ function getCursor<T>(changeStream: ChangeStream<T>, callback: Callback<ChangeSt
  * @param changeStream - the parent ChangeStream
  * @param err - error getting a new cursor
  */
-function processResumeQueue<TSchema>(changeStream: ChangeStream<TSchema>, err?: Error) {
+function processResumeQueue<TSchema extends Document>(
+  changeStream: ChangeStream<TSchema>,
+  err?: Error
+) {
   while (changeStream[kResumeQueue].length) {
     const request = changeStream[kResumeQueue].pop();
     if (!request) break; // Should never occur but TS can't use the length check in the while condition