Merge branch 'main' into NODE-3818

Author: nbbeeken

etc/notes/CHANGES_5.0.0.md

@@ -21,6 +21,16 @@ The following is a detailed collection of the changes in the major v5 release of
 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.
 
+### Bulk results no longer contain `lastOp()` and `opTime`
+
+The `lastOp()` method and `opTime` property on the `BulkResult` have been removed. Merging of bulk results
+no longer normalizes the values. There is no new method or property to replace them.
+
+### `CursorCloseOptions` removed
+
+When calling `close()` on a `Cursor`, no more options can be provided. This removes support for the
+`skipKillCursors` option that was unused.
+
 ### Snappy v7.x.x or later and optional peerDependency
 
 `snappy` compression has been added to the package.json as a peerDependency that is **optional**.

src/bulk/common.ts

@@ -1,11 +1,4 @@
-import {
-  BSONSerializeOptions,
-  Document,
-  Long,
-  ObjectId,
-  resolveBSONOptions,
-  Timestamp
-} from '../bson';
+import { BSONSerializeOptions, Document, ObjectId, resolveBSONOptions } from '../bson';
 import type { Collection } from '../collection';
 import {
   AnyError,
@@ -146,7 +139,6 @@ export interface BulkResult {
   nModified: number;
   nRemoved: number;
   upserted: Document[];
-  opTime?: Document;
 }
 
 /**
@@ -300,15 +292,6 @@ export class BulkWriteResult {
     return this.result.writeErrors;
   }
 
-  /**
-   * Retrieve lastOp if available
-   *
-   * @deprecated Will be removed in 5.0
-   */
-  getLastOp(): Document | undefined {
-    return this.result.opTime;
-  }
-
   /** Retrieve the write concern error if one exists */
   getWriteConcernError(): WriteConcernError | undefined {
     if (this.result.writeConcernErrors.length === 0) {
@@ -449,12 +432,6 @@ export class WriteError {
   }
 }
 
-/** Converts the number to a Long or returns it. */
-function longOrConvert(value: number | Long | Timestamp): Long | Timestamp {
-  // TODO(NODE-2674): Preserve int64 sent from MongoDB
-  return typeof value === 'number' ? Long.fromNumber(value) : value;
-}
-
 /** Merges results into shared data structure */
 export function mergeBatchResults(
   batch: Batch,
@@ -491,44 +468,6 @@ export function mergeBatchResults(
     return;
   }
 
-  // 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) {
-    let opTime = result.lastOp || result.opTime;
-
-    // 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 };
-    }
-
-    // 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;
-        }
-      }
-    }
-  }
-
   // If we have an insert Batch type
   if (isInsertBatch(batch) && result.n) {
     bulkResult.nInserted = bulkResult.nInserted + result.n;

src/cursor/abstract_cursor.ts

@@ -58,14 +58,6 @@ export const CURSOR_FLAGS = [
   'partial'
 ] as const;
 
-/** @public
- * @deprecated This interface is deprecated */
-export interface CursorCloseOptions {
-  /** Bypass calling killCursors when closing the cursor. */
-  /** @deprecated  the skipKillCursors option is deprecated */
-  skipKillCursors?: boolean;
-}
-
 /** @public */
 export interface CursorStreamOptions {
   /** A transformation method applied to each document emitted by the stream */
@@ -447,18 +439,7 @@ export abstract class AbstractCursor<
   close(): Promise<void>;
   /** @deprecated Callbacks are deprecated and will be removed in the next major version. See [mongodb-legacy](https://github.com/mongodb-js/nodejs-mongodb-legacy) for migration assistance */
   close(callback: Callback): void;
-  /**
-   * @deprecated options argument is deprecated
-   */
-  close(options: CursorCloseOptions): Promise<void>;
-  /**
-   * @deprecated options argument is deprecated. Callbacks are deprecated and will be removed in the next major version. See [mongodb-legacy](https://github.com/mongodb-js/nodejs-mongodb-legacy) for migration assistance
-   */
-  close(options: CursorCloseOptions, callback: Callback): void;
-  close(options?: CursorCloseOptions | Callback, callback?: Callback): Promise<void> | void {
-    if (typeof options === 'function') (callback = options), (options = {});
-    options = options ?? {};
-
+  close(callback?: Callback): Promise<void> | void {
     const needsToEmitClosed = !this[kClosed];
     this[kClosed] = true;
 

src/index.ts

@@ -257,7 +257,6 @@ export type { MONGO_CLIENT_EVENTS } from './constants';
 export type {
   AbstractCursorEvents,
   AbstractCursorOptions,
-  CursorCloseOptions,
   CursorFlag,
   CursorStreamOptions
 } from './cursor/abstract_cursor';