mongodb 4.1.2 → 4.2.1

package/mongodb.ts34.d.ts

@@ -25,6 +25,7 @@ import { Readable } from 'stream';
 import { serialize as serialize_2 } from 'bson';
 import { SerializeOptions } from 'bson';
 import { Socket } from 'net';
+import { SrvRecord } from 'dns';
 import { TcpNetConnectOpts } from 'net';
 import { Timestamp } from 'bson';
 import { TLSSocket } from 'tls';
@@ -649,7 +650,7 @@ export { BSONRegExp };
  * BSON Serialization options.
  * @public
  */
-export declare interface BSONSerializeOptions extends Pick<SerializeOptions, Exclude<keyof SerializeOptions, 'index'>>, Pick<DeserializeOptions, Exclude<keyof DeserializeOptions, 'evalFunctions' | 'cacheFunctions' | 'cacheFunctionsCrc32' | 'allowObjectSmallerThanBufferSize' | 'index'>> {
+export declare interface BSONSerializeOptions extends Pick<SerializeOptions, Exclude<keyof SerializeOptions, 'index'>>, Pick<DeserializeOptions, Exclude<keyof DeserializeOptions, 'evalFunctions' | 'cacheFunctions' | 'cacheFunctionsCrc32' | 'allowObjectSmallerThanBufferSize' | 'index' | 'validation'>> {
     /** Return BSON filled buffers from operations */
     raw?: boolean;
 }
@@ -746,8 +747,10 @@ export declare abstract class BulkOperationBase {
     readonly bsonOptions: BSONSerializeOptions;
     readonly writeConcern: WriteConcern | undefined;
     readonly batches: Batch[];
-    /** An internal helper method. Do not invoke directly. Will be going away in the future */
-    execute(options?: BulkWriteOptions, callback?: Callback<BulkWriteResult>): Promise<BulkWriteResult> | void;
+    execute(options?: BulkWriteOptions): Promise<BulkWriteResult>;
+    execute(callback: Callback<BulkWriteResult>): void;
+    execute(options: BulkWriteOptions | undefined, callback: Callback<BulkWriteResult>): void;
+    execute(options?: BulkWriteOptions | Callback<BulkWriteResult>, callback?: Callback<BulkWriteResult>): Promise<BulkWriteResult> | void;
     /* Excluded from this release type: handleWriteError */
     abstract addToOperationsList(batchType: BatchType, document: Document | UpdateStatement | DeleteStatement): this;
 }
@@ -860,7 +863,7 @@ export declare class CancellationToken extends TypedEventEmitter<{
  * Creates a new Change Stream instance. Normally created using {@link Collection#watch|Collection.watch()}.
  * @public
  */
-export declare class ChangeStream<TSchema extends Document = Document> extends TypedEventEmitter<ChangeStreamEvents> {
+export declare class ChangeStream<TSchema extends Document = Document> extends TypedEventEmitter<ChangeStreamEvents<TSchema>> {
     pipeline: Document[];
     options: ChangeStreamOptions;
     parent: MongoClient | Db | Collection;
@@ -901,7 +904,8 @@ export declare class ChangeStream<TSchema extends Document = Document> extends T
     The cached resume token that is used to resume after the most recently returned change. */
     readonly resumeToken: ResumeToken;
     /** Check if there is any document still available in the Change Stream */
-    hasNext(callback?: Callback): Promise<void> | void;
+    hasNext(): Promise<boolean>;
+    hasNext(callback: Callback<boolean>): void;
     /** Get the next available document from the Change Stream. */
     next(): Promise<ChangeStreamDocument<TSchema>>;
     next(callback: Callback<ChangeStreamDocument<TSchema>>): void;
@@ -974,14 +978,14 @@ export declare interface ChangeStreamDocument<TSchema extends Document = Documen
     fullDocument?: TSchema;
 }
 /** @public */
-export declare type ChangeStreamEvents = {
+export declare type ChangeStreamEvents<TSchema extends Document = Document> = {
     resumeTokenChanged(token: ResumeToken): void;
-    init(response: Document): void;
-    more(response?: Document | undefined): void;
+    init(response: TSchema): void;
+    more(response?: TSchema | undefined): void;
     response(): void;
     end(): void;
     error(error: Error): void;
-    change(change: ChangeStreamDocument): void;
+    change(change: ChangeStreamDocument<TSchema>): void;
 } & AbstractCursorEvents;
 /**
  * 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.
@@ -1381,12 +1385,12 @@ export declare class Collection<TSchema extends Document = Document> {
      * @param options - Optional settings for the command
      * @param callback - An optional callback, a Promise will be returned if none is provided
      */
-    findOne(): Promise<TSchema | null>;
-    findOne(callback: Callback<TSchema | null>): void;
-    findOne(filter: Filter<TSchema>): Promise<TSchema | null>;
-    findOne(filter: Filter<TSchema>, callback: Callback<TSchema | null>): void;
-    findOne(filter: Filter<TSchema>, options: FindOptions): Promise<TSchema | null>;
-    findOne(filter: Filter<TSchema>, options: FindOptions, callback: Callback<TSchema | null>): void;
+    findOne(): Promise<WithId<TSchema> | null>;
+    findOne(callback: Callback<WithId<TSchema> | null>): void;
+    findOne(filter: Filter<TSchema>): Promise<WithId<TSchema> | null>;
+    findOne(filter: Filter<TSchema>, callback: Callback<WithId<TSchema> | null>): void;
+    findOne(filter: Filter<TSchema>, options: FindOptions): Promise<WithId<TSchema> | null>;
+    findOne(filter: Filter<TSchema>, options: FindOptions, callback: Callback<WithId<TSchema> | null>): void;
     findOne<T = TSchema>(): Promise<T | null>;
     findOne<T = TSchema>(callback: Callback<T | null>): void;
     findOne<T = TSchema>(filter: Filter<TSchema>): Promise<T | null>;
@@ -1397,8 +1401,8 @@ export declare class Collection<TSchema extends Document = Document> {
      *
      * @param filter - The filter predicate. If unspecified, then all documents in the collection will match the predicate
      */
-    find(): FindCursor<TSchema>;
-    find(filter: Filter<TSchema>, options?: FindOptions): FindCursor<TSchema>;
+    find(): FindCursor<WithId<TSchema>>;
+    find(filter: Filter<TSchema>, options?: FindOptions): FindCursor<WithId<TSchema>>;
     find<T>(filter: Filter<TSchema>, options?: FindOptions): FindCursor<T>;
     /**
      * Returns the options of the collection.
@@ -1661,7 +1665,7 @@ export declare class Collection<TSchema extends Document = Document> {
      * @param pipeline - An array of aggregation pipelines to execute
      * @param options - Optional settings for the command
      */
-    aggregate<T = TSchema>(pipeline?: Document[], options?: AggregateOptions): AggregationCursor<T>;
+    aggregate<T = Document>(pipeline?: Document[], options?: AggregateOptions): AggregationCursor<T>;
     /**
      * Create a new Change Stream, watching for new changes (insertions, updates, replacements, deletions, and invalidations) in this collection.
      *
@@ -1673,6 +1677,7 @@ export declare class Collection<TSchema extends Document = Document> {
     /**
      * Run Map Reduce across a collection. Be aware that the inline option for out will return an array of results not a collection.
      *
+     * @deprecated collection.mapReduce is deprecated. Use the aggregation pipeline instead. Visit https://docs.mongodb.com/manual/reference/map-reduce-to-aggregation-pipeline for more information on how to translate map-reduce operations to the aggregation pipeline.
      * @param map - The mapping function.
      * @param reduce - The reduce function.
      * @param options - Optional settings for the command
@@ -2225,10 +2230,9 @@ export declare class Db {
      * @param options - Optional settings for the command
      * @param callback - An optional callback, a Promise will be returned if none is provided
      */
-    createCollection<TSchema extends Document = Document>(name: string): Promise<Collection<TSchema>>;
+    createCollection<TSchema extends Document = Document>(name: string, options?: CreateCollectionOptions): Promise<Collection<TSchema>>;
     createCollection<TSchema extends Document = Document>(name: string, callback: Callback<Collection<TSchema>>): void;
-    createCollection<TSchema extends Document = Document>(name: string, options: CreateCollectionOptions): Promise<Collection<TSchema>>;
-    createCollection<TSchema extends Document = Document>(name: string, options: CreateCollectionOptions, callback: Callback<Collection<TSchema>>): void;
+    createCollection<TSchema extends Document = Document>(name: string, options: CreateCollectionOptions | undefined, callback: Callback<Collection<TSchema>>): void;
     /**
      * Execute a command
      *
@@ -2579,8 +2583,8 @@ export declare type ExplainVerbosity = string;
 export declare type ExplainVerbosityLike = ExplainVerbosity | boolean;
 /** A MongoDB filter can be some portion of the schema or a set of operators @public */
 export declare type Filter<TSchema> = {
-    [P in keyof TSchema]?: Condition<TSchema[P]>;
-} & RootFilterOperators<TSchema>;
+    [P in keyof WithId<TSchema>]?: Condition<WithId<TSchema>[P]>;
+} & RootFilterOperators<WithId<TSchema>>;
 /** @public */
 export declare type FilterOperations<T> = T extends Record<string, any> ? {
     [key in keyof T]?: FilterOperators<T[key]>;
@@ -3181,11 +3185,13 @@ export declare class HostAddress {
     socketPath: string | undefined;
     isIPv6: boolean | undefined;
     constructor(hostString: string);
+    inspect(): string;
     /**
      * @param ipv6Brackets - optionally request ipv6 bracket notation required for connection strings
      */
     toString(ipv6Brackets?: boolean): string;
     static fromString(s: string): HostAddress;
+    static fromSrvRecord({ name, port }: SrvRecord): HostAddress;
 }
 /** @public */
 export declare interface IndexDescription extends Pick<CreateIndexesOptions, 'background' | 'unique' | 'partialFilterExpression' | 'sparse' | 'hidden' | 'expireAfterSeconds' | 'storageEngine' | 'version' | 'weights' | 'default_language' | 'language_override' | 'textIndexVersion' | '2dsphereIndexVersion' | 'bits' | 'min' | 'max' | 'bucketSize' | 'wildcardProjection'> {
@@ -3366,6 +3372,8 @@ export declare class ListCollectionsCursor<T extends Pick<CollectionInfo, 'name'
 export declare interface ListCollectionsOptions extends CommandOperationOptions {
     /** Since 4.0: If true, will only return the collection name in the response, and will omit additional info */
     nameOnly?: boolean;
+    /** Since 4.0: If true and nameOnly is true, allows a user without the required privilege (i.e. listCollections action on the database) to run the command when access control is enforced. */
+    authorizedCollections?: boolean;
     /** The batchSize for the returned command cursor or if pre 2.8 the systems batch collection */
     batchSize?: number;
 }
@@ -3379,7 +3387,16 @@ export declare interface ListDatabasesOptions extends CommandOperationOptions {
     authorizedDatabases?: boolean;
 }
 /** @public */
-export declare type ListDatabasesResult = string[] | Document[];
+export declare interface ListDatabasesResult {
+    databases: ({
+        name: string;
+        sizeOnDisk?: number;
+        empty?: boolean;
+    } & Document)[];
+    totalSize?: number;
+    totalSizeMb?: number;
+    ok: 1 | 0;
+}
 /** @public */
 export declare class ListIndexesCursor extends AbstractCursor {
     parent: Collection;
@@ -3769,6 +3786,16 @@ export declare interface MongoClientOptions extends BSONSerializeOptions, Suppor
     compressors?: CompressorName[] | string;
     /** An integer that specifies the compression level if using zlib for network compression. */
     zlibCompressionLevel?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | undefined;
+    /** The maximum number of hosts to connect to when using an srv connection string, a setting of `0` means unlimited hosts */
+    srvMaxHosts?: number;
+    /**
+     * Modifies the srv URI to look like:
+     *
+     * `_{srvServiceName}._tcp.{hostname}.{domainname}`
+     *
+     * Querying this DNS URI is expected to respond with SRV records
+     */
+    srvServiceName?: string;
     /** The maximum number of connections in the connection pool. */
     maxPoolSize?: number;
     /** The minimum number of connections in the connection pool. */
@@ -4127,7 +4154,7 @@ export declare class MongoNotConnectedError extends MongoAPIError {
  * Mongo Client Options
  * @public
  */
-export declare interface MongoOptions extends Required<Pick<MongoClientOptions, 'autoEncryption' | 'connectTimeoutMS' | 'directConnection' | 'driverInfo' | 'forceServerObjectId' | 'minHeartbeatFrequencyMS' | 'heartbeatFrequencyMS' | 'keepAlive' | 'keepAliveInitialDelay' | 'localThresholdMS' | 'logger' | 'maxIdleTimeMS' | 'maxPoolSize' | 'minPoolSize' | 'monitorCommands' | 'noDelay' | 'pkFactory' | 'promiseLibrary' | 'raw' | 'replicaSet' | 'retryReads' | 'retryWrites' | 'serverSelectionTimeoutMS' | 'socketTimeoutMS' | 'tlsAllowInvalidCertificates' | 'tlsAllowInvalidHostnames' | 'tlsInsecure' | 'waitQueueTimeoutMS' | 'zlibCompressionLevel'>>, SupportedNodeConnectionOptions {
+export declare interface MongoOptions extends Required<Pick<MongoClientOptions, 'autoEncryption' | 'connectTimeoutMS' | 'directConnection' | 'driverInfo' | 'forceServerObjectId' | 'minHeartbeatFrequencyMS' | 'heartbeatFrequencyMS' | 'keepAlive' | 'keepAliveInitialDelay' | 'localThresholdMS' | 'logger' | 'maxIdleTimeMS' | 'maxPoolSize' | 'minPoolSize' | 'monitorCommands' | 'noDelay' | 'pkFactory' | 'promiseLibrary' | 'raw' | 'replicaSet' | 'retryReads' | 'retryWrites' | 'serverSelectionTimeoutMS' | 'socketTimeoutMS' | 'srvMaxHosts' | 'srvServiceName' | 'tlsAllowInvalidCertificates' | 'tlsAllowInvalidHostnames' | 'tlsInsecure' | 'waitQueueTimeoutMS' | 'zlibCompressionLevel'>>, SupportedNodeConnectionOptions {
     hosts: HostAddress[];
     srvHost?: string;
     credentials?: MongoCredentials;
@@ -4312,6 +4339,8 @@ export declare interface OperationOptions extends BSONSerializeOptions {
     willRetryWrites?: boolean;
     /** The preferred read preference (ReadPreference.primary, ReadPreference.primary_preferred, ReadPreference.secondary, ReadPreference.secondary_preferred, ReadPreference.nearest). */
     readPreference?: ReadPreferenceLike;
+    /* Excluded from this release type: bypassPinningCheck */
+    omitReadPreference?: boolean;
 }
 /* Excluded from this release type: OperationParent */
 /**
@@ -4332,11 +4361,13 @@ export declare type OperationTime = Timestamp;
  * `TSchema['_id'] extends ObjectId` which translated to "Is the _id property ObjectId?"
  * we instead ask "Does ObjectId look like (have the same shape) as the _id?"
  */
-export declare type OptionalId<TSchema extends {
+export declare type OptionalId<TSchema> = TSchema extends {
     _id?: any;
-}> = ObjectId extends TSchema['_id'] ? EnhancedOmit<TSchema, '_id'> & {
+} ? ObjectId extends TSchema['_id'] ? EnhancedOmit<TSchema, '_id'> & {
+    _id?: InferIdType<TSchema>;
+} : WithId<TSchema> : EnhancedOmit<TSchema, '_id'> & {
     _id?: InferIdType<TSchema>;
-} : WithId<TSchema>;
+};
 /** @public */
 export declare class OrderedBulkOperation extends BulkOperationBase {
     constructor(collection: Collection, options: BulkWriteOptions);
@@ -4927,7 +4958,7 @@ export declare type TagSet = {
 export declare interface TimeSeriesCollectionOptions extends Document {
     timeField: string;
     metaField?: string;
-    granularity?: string;
+    granularity?: 'seconds' | 'minutes' | 'hours' | string;
 }
 export { Timestamp };
 /* Excluded from this release type: Topology */
@@ -5016,6 +5047,8 @@ export declare class TopologyOpeningEvent {
 }
 /** @public */
 export declare interface TopologyOptions extends BSONSerializeOptions, ServerOptions {
+    srvMaxHosts: number;
+    srvServiceName: string;
     hosts: HostAddress[];
     retryWrites: boolean;
     retryReads: boolean;
@@ -5079,7 +5112,7 @@ export declare class Transaction {
  */
 export declare interface TransactionOptions extends CommandOperationOptions {
     /** A default read concern for commands in this transaction */
-    readConcern?: ReadConcern;
+    readConcern?: ReadConcernLike;
     /** A default writeConcern for commands in this transaction */
     writeConcern?: WriteConcern;
     /** A default read preference for commands in this transaction */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "4.1.2",
+  "version": "4.2.1",
   "description": "The official MongoDB driver for Node.js",
   "main": "lib/index.js",
   "files": [
@@ -32,56 +32,54 @@
     "email": "dbx-node@mongodb.com"
   },
   "dependencies": {
-    "bson": "^4.5.2",
+    "bson": "^4.6.0",
     "denque": "^2.0.1",
-    "mongodb-connection-string-url": "^2.0.0"
+    "mongodb-connection-string-url": "^2.2.0"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@microsoft/api-extractor": "^7.18.7",
+    "@microsoft/api-extractor": "^7.18.19",
     "@microsoft/tsdoc-config": "^0.15.2",
-    "@types/chai": "^4.2.21",
+    "@types/chai": "^4.2.22",
     "@types/chai-subset": "^1.3.3",
     "@types/kerberos": "^1.1.1",
     "@types/mocha": "^9.0.0",
-    "@types/node": "^16.7.13",
+    "@types/node": "^16.11.8",
     "@types/saslprep": "^1.0.1",
-    "@types/semver": "^7.3.8",
+    "@types/semver": "^7.3.9",
+    "@types/sinon": "^10.0.6",
     "@types/whatwg-url": "^8.2.1",
-    "@typescript-eslint/eslint-plugin": "^4.31.0",
-    "@typescript-eslint/parser": "^4.31.0",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
     "bluebird": "^3.7.2",
     "chai": "^4.3.4",
     "chai-subset": "^1.6.0",
     "chalk": "^4.1.2",
     "co": "4.6.0",
     "downlevel-dts": "^0.7.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.2.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-jsdoc": "^36.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-tsdoc": "^0.2.14",
     "js-yaml": "^4.1.0",
-    "jsdoc": "^3.6.7",
     "lodash.camelcase": "^4.3.0",
-    "mocha": "^9.1.1",
+    "mocha": "^9.1.3",
     "mocha-sinon": "^2.1.2",
     "mongodb-mock-server": "^2.0.1",
     "nyc": "^15.1.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.4.1",
     "rimraf": "^3.0.2",
     "semver": "^7.3.5",
-    "sinon": "^11.1.2",
+    "sinon": "^12.0.1",
     "sinon-chai": "^3.7.0",
-    "source-map-support": "^0.5.19",
-    "standard-version": "^9.3.1",
-    "ts-node": "^10.2.1",
-    "tsd": "^0.17.0",
-    "typedoc": "^0.21.9",
-    "typescript": "4.3.5",
+    "source-map-support": "^0.5.20",
+    "standard-version": "^9.3.2",
+    "ts-node": "^10.4.0",
+    "tsd": "^0.19.0",
+    "typescript": "^4.5.2",
     "typescript-cached-transpile": "^0.0.6",
     "xml2js": "^0.4.23",
-    "yargs": "^17.1.1"
+    "yargs": "^17.2.1"
   },
   "license": "Apache-2.0",
   "engines": {
@@ -96,27 +94,31 @@
   },
   "scripts": {
     "build:evergreen": "node .evergreen/generate_evergreen_tasks.js",
-    "build:ts": "rimraf lib && tsc",
+    "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",
     "check:bench": "node test/benchmarks/driverBench",
-    "check:coverage": "nyc npm run check:test",
+    "check:coverage": "nyc npm run test:all",
     "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": "tsc --noEmit mongodb.d.ts && tsd",
-    "check:test": "mocha --recursive test/functional test/unit",
-    "check:ts": "tsc -v && tsc --noEmit",
+    "check:dts": "./node_modules/typescript/bin/tsc --noEmit mongodb.d.ts && tsd",
+    "check:test": "mocha --file test/tools/runner --recursive test/functional test/integration",
+    "check:unit": "mocha --recursive 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 test/manual/data_lake.test.js",
+    "check:adl": "mocha --file test/tools/runner test/manual/data_lake.test.js",
+    "check:aws": "mocha --file test/tools/runner test/functional/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:csfle": "mocha test/functional/client_side_encryption",
+    "check:csfle": "mocha --file test/tools/runner test/functional/client_side_encryption",
+    "check:snappy": "mocha --file test/tools/runner test/functional/unit_snappy.test.js",
     "prepare": "node etc/prepare.js",
     "release": "standard-version -i HISTORY.md",
-    "test": "npm run check:lint && npm run check:test"
+    "test": "npm run check:lint && npm run test:all",
+    "test:all": "npm run check:unit && npm run check:test"
   },
   "tsd": {
     "directory": "test/types",

package/src/bson.ts

@@ -51,6 +51,7 @@ export interface BSONSerializeOptions
       | 'cacheFunctionsCrc32'
       | 'allowObjectSmallerThanBufferSize'
       | 'index'
+      | 'validation'
     > {
   /** Return BSON filled buffers from operations */
   raw?: boolean;

package/src/bulk/common.ts

@@ -1,5 +1,12 @@
 import { PromiseProvider } from '../promise_provider';
-import { Long, ObjectId, Document, BSONSerializeOptions, resolveBSONOptions } from '../bson';
+import {
+  Long,
+  ObjectId,
+  Document,
+  BSONSerializeOptions,
+  resolveBSONOptions,
+  Timestamp
+} from '../bson';
 import {
   MongoWriteConcernError,
   AnyError,
@@ -433,8 +440,13 @@ export class WriteError {
   }
 }
 
+/** Converts the number to a Long or returns it. */
+function longOrConvert(value: number | Long | Timestamp): Long | Timestamp {
+  return typeof value === 'number' ? Long.fromNumber(value) : value;
+}
+
 /** Merges results into shared data structure */
-function mergeBatchResults(
+export function mergeBatchResults(
   batch: Batch,
   bulkResult: BulkResult,
   err?: AnyError,
@@ -469,42 +481,37 @@ function mergeBatchResults(
     return;
   }
 
-  // Deal with opTime if available
+  // The server write command specification states that lastOp is an optional
+  // mongod only field that has a type of timestamp. Across various scarce specs
+  // where opTime is mentioned, it is an "opaque" object that can have a "ts" and
+  // "t" field with Timestamp and Long as their types respectively.
+  // The "lastOp" field of the bulk write result is never mentioned in the driver
+  // specifications or the bulk write spec, so we should probably just keep its
+  // value consistent since it seems to vary.
+  // See: https://github.com/mongodb/specifications/blob/master/source/driver-bulk-update.rst#results-object
   if (result.opTime || result.lastOp) {
-    const opTime = result.lastOp || result.opTime;
-    let lastOpTS = null;
-    let lastOpT = null;
-
-    // We have a time stamp
-    if (opTime && opTime._bsontype === 'Timestamp') {
-      if (bulkResult.opTime == null) {
-        bulkResult.opTime = opTime;
-      } else if (opTime.greaterThan(bulkResult.opTime)) {
-        bulkResult.opTime = opTime;
-      }
-    } else {
-      // Existing TS
-      if (bulkResult.opTime) {
-        lastOpTS =
-          typeof bulkResult.opTime.ts === 'number'
-            ? Long.fromNumber(bulkResult.opTime.ts)
-            : bulkResult.opTime.ts;
-        lastOpT =
-          typeof bulkResult.opTime.t === 'number'
-            ? Long.fromNumber(bulkResult.opTime.t)
-            : bulkResult.opTime.t;
-      }
+    let opTime = result.lastOp || result.opTime;
 
-      // Current OpTime TS
-      const opTimeTS = typeof opTime.ts === 'number' ? Long.fromNumber(opTime.ts) : opTime.ts;
-      const opTimeT = typeof opTime.t === 'number' ? Long.fromNumber(opTime.t) : opTime.t;
+    // If the opTime is a Timestamp, convert it to a consistent format to be
+    // able to compare easily. Converting to the object from a timestamp is
+    // much more straightforward than the other direction.
+    if (opTime._bsontype === 'Timestamp') {
+      opTime = { ts: opTime, t: Long.ZERO };
+    }
 
-      // Compare the opTime's
-      if (bulkResult.opTime == null) {
-        bulkResult.opTime = opTime;
-      } else if (opTimeTS.greaterThan(lastOpTS)) {
+    // If there's no lastOp, just set it.
+    if (!bulkResult.opTime) {
+      bulkResult.opTime = opTime;
+    } else {
+      // First compare the ts values and set if the opTimeTS value is greater.
+      const lastOpTS = longOrConvert(bulkResult.opTime.ts);
+      const opTimeTS = longOrConvert(opTime.ts);
+      if (opTimeTS.greaterThan(lastOpTS)) {
         bulkResult.opTime = opTime;
       } else if (opTimeTS.equals(lastOpTS)) {
+        // If the ts values are equal, then compare using the t values.
+        const lastOpT = longOrConvert(bulkResult.opTime.t);
+        const opTimeT = longOrConvert(opTime.t);
         if (opTimeT.greaterThan(lastOpT)) {
           bulkResult.opTime = opTime;
         }
@@ -1209,9 +1216,15 @@ export abstract class BulkOperationBase {
     return batches;
   }
 
-  /** An internal helper method. Do not invoke directly. Will be going away in the future */
+  execute(options?: BulkWriteOptions): Promise<BulkWriteResult>;
+  execute(callback: Callback<BulkWriteResult>): void;
+  execute(options: BulkWriteOptions | undefined, callback: Callback<BulkWriteResult>): void;
+  execute(
+    options?: BulkWriteOptions | Callback<BulkWriteResult>,
+    callback?: Callback<BulkWriteResult>
+  ): Promise<BulkWriteResult> | void;
   execute(
-    options?: BulkWriteOptions,
+    options?: BulkWriteOptions | Callback<BulkWriteResult>,
     callback?: Callback<BulkWriteResult>
   ): Promise<BulkWriteResult> | void {
     if (typeof options === 'function') (callback = options), (options = {});

package/src/change_stream.ts

@@ -184,23 +184,23 @@ export interface UpdateDescription<TSchema extends Document = Document> {
 }
 
 /** @public */
-export type ChangeStreamEvents = {
+export type ChangeStreamEvents<TSchema extends Document = Document> = {
   resumeTokenChanged(token: ResumeToken): void;
-  init(response: Document): void;
-  more(response?: Document | undefined): void;
+  init(response: TSchema): void;
+  more(response?: TSchema | undefined): void;
   response(): void;
   end(): void;
   error(error: Error): void;
-  change(change: ChangeStreamDocument): void;
+  change(change: ChangeStreamDocument<TSchema>): void;
 } & AbstractCursorEvents;
 
 /**
  * Creates a new Change Stream instance. Normally created using {@link Collection#watch|Collection.watch()}.
  * @public
  */
-export class ChangeStream<
-  TSchema extends Document = Document
-> extends TypedEventEmitter<ChangeStreamEvents> {
+export class ChangeStream<TSchema extends Document = Document> extends TypedEventEmitter<
+  ChangeStreamEvents<TSchema>
+> {
   pipeline: Document[];
   options: ChangeStreamOptions;
   parent: MongoClient | Db | Collection;
@@ -310,7 +310,9 @@ export class ChangeStream<
   }
 
   /** Check if there is any document still available in the Change Stream */
-  hasNext(callback?: Callback): Promise<void> | void {
+  hasNext(): Promise<boolean>;
+  hasNext(callback: Callback<boolean>): void;
+  hasNext(callback?: Callback): Promise<boolean> | void {
     setIsIterator(this);
     return maybePromise(callback, cb => {
       getCursor(this, (err, cursor) => {

package/src/cmap/commands.ts

@@ -469,6 +469,8 @@ export interface MessageHeader {
 export interface OpResponseOptions extends BSONSerializeOptions {
   raw?: boolean;
   documentsReturnedIn?: string | null;
+  // For now we use this internally to only prevent writeErrors from crashing the driver
+  validation?: { utf8: { writeErrors: boolean } };
 }
 
 /** @internal */
@@ -837,22 +839,24 @@ export class BinMsg {
     const promoteValues = options.promoteValues ?? this.opts.promoteValues;
     const promoteBuffers = options.promoteBuffers ?? this.opts.promoteBuffers;
     const bsonRegExp = options.bsonRegExp ?? this.opts.bsonRegExp;
+    const validation = options.validation ?? { utf8: { writeErrors: false } };
 
     // Set up the options
-    const _options: BSONSerializeOptions = {
+    const bsonOptions: BSONSerializeOptions = {
       promoteLongs,
       promoteValues,
       promoteBuffers,
-      bsonRegExp
-    };
+      bsonRegExp,
+      validation
+      // Due to the strictness of the BSON libraries validation option we need this cast
+    } as BSONSerializeOptions & { validation: { utf8: { writeErrors: boolean } } };
 
     while (this.index < this.data.length) {
       const payloadType = this.data.readUInt8(this.index++);
       if (payloadType === 0) {
         const bsonSize = this.data.readUInt32LE(this.index);
         const bin = this.data.slice(this.index, this.index + bsonSize);
-        this.documents.push(raw ? bin : BSON.deserialize(bin, _options));
-
+        this.documents.push(raw ? bin : BSON.deserialize(bin, bsonOptions));
         this.index += bsonSize;
       } else if (payloadType === 1) {
         // It was decided that no driver makes use of payload type 1
@@ -865,9 +869,8 @@ export class BinMsg {
     if (this.documents.length === 1 && documentsReturnedIn != null && raw) {
       const fieldsAsRaw: Document = {};
       fieldsAsRaw[documentsReturnedIn] = true;
-      _options.fieldsAsRaw = fieldsAsRaw;
-
-      const doc = BSON.deserialize(this.documents[0] as Buffer, _options);
+      bsonOptions.fieldsAsRaw = fieldsAsRaw;
+      const doc = BSON.deserialize(this.documents[0] as Buffer, bsonOptions);
       this.documents = [doc];
     }
 

package/src/cmap/connection.ts

@@ -97,6 +97,7 @@ export interface CommandOptions extends BSONSerializeOptions {
   session?: ClientSession;
   documentsReturnedIn?: string;
   noResponse?: boolean;
+  omitReadPreference?: boolean;
 
   // FIXME: NODE-2802
   willRetryWrite?: boolean;

package/src/cmap/wire_protocol/constants.ts

@@ -1,7 +1,7 @@
-export const MIN_SUPPORTED_SERVER_VERSION = '2.6';
-export const MAX_SUPPORTED_SERVER_VERSION = '5.0';
-export const MIN_SUPPORTED_WIRE_VERSION = 2;
-export const MAX_SUPPORTED_WIRE_VERSION = 13;
+export const MIN_SUPPORTED_SERVER_VERSION = '3.6';
+export const MAX_SUPPORTED_SERVER_VERSION = '5.1';
+export const MIN_SUPPORTED_WIRE_VERSION = 6;
+export const MAX_SUPPORTED_WIRE_VERSION = 14;
 export const OP_REPLY = 1;
 export const OP_UPDATE = 2001;
 export const OP_INSERT = 2002;