NODE-2815: alternative no generic parameter for options

src/admin.ts

@@ -104,7 +104,7 @@ export class Admin {
     callback?: Callback<Document>
   ): Promise<Document> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
     return this.command({ buildinfo: 1 }, options, callback as Callback<Document>);
   }
 
@@ -123,7 +123,7 @@ export class Admin {
     callback?: Callback<Document>
   ): Promise<Document> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
     return this.command({ buildinfo: 1 }, options, callback as Callback<Document>);
   }
 
@@ -142,7 +142,7 @@ export class Admin {
     callback?: Callback<Document>
   ): Promise<Document> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
     return this.command({ serverStatus: 1 }, options, callback as Callback<Document>);
   }
 
@@ -161,7 +161,7 @@ export class Admin {
     callback?: Callback<Document>
   ): Promise<Document> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
     return this.command({ ping: 1 }, options, callback as Callback<Document>);
   }
 
@@ -260,7 +260,7 @@ export class Admin {
     callback?: Callback<Document>
   ): Promise<Document> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     return executeOperation(
       getTopology(this.s.db),
@@ -284,7 +284,7 @@ export class Admin {
     callback?: Callback<ListDatabasesResult>
   ): Promise<ListDatabasesResult> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     return executeOperation(
       getTopology(this.s.db),
@@ -308,7 +308,7 @@ export class Admin {
     callback?: Callback<Document>
   ): Promise<Document> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
     return this.command({ replSetGetStatus: 1 }, options, callback as Callback<Document>);
   }
 }

src/bulk/common.ts

@@ -1212,7 +1212,7 @@ export abstract class BulkOperationBase {
   /** An internal helper method. Do not invoke directly. Will be going away in the future */
   execute(options?: BulkWriteOptions, callback?: Callback<BulkWriteResult>): Promise<void> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     if (this.s.executed) {
       return handleEarlyError(new MongoError('Batch cannot be re-executed'), callback);

src/cmap/commands.ts

@@ -538,7 +538,7 @@ export class Response {
   parse(options: OpResponseOptions): void {
     // Don't parse again if not needed
     if (this.parsed) return;
-    options = options || {};
+    options = options ?? {};
 
     // Allow the return of raw documents instead of parsing
     const raw = options.raw || false;
@@ -666,7 +666,7 @@ export class Msg {
     }
 
     // Ensure empty options
-    this.options = options || {};
+    this.options = options ?? {};
 
     // Additional options
     this.requestId = options.requestId ? options.requestId : Msg.getRequestId();
@@ -806,7 +806,7 @@ export class BinMsg {
   parse(options: OpResponseOptions): void {
     // Don't parse again if not needed
     if (this.parsed) return;
-    options = options || {};
+    options = options ?? {};
 
     this.index = 4;
     // Allow the return of raw documents instead of parsing

src/cmap/connection.ts

@@ -397,7 +397,7 @@ function write(
     callback = options;
   }
 
-  options = options || {};
+  options = options ?? {};
   const operationDescription: OperationDescription = {
     requestId: command.requestId,
     cb: callback,

src/cmap/wire_protocol/get_more.ts

@@ -21,7 +21,7 @@ export function getMore(
   options: GetMoreOptions,
   callback: Callback<Document>
 ): void {
-  options = options || {};
+  options = options ?? {};
 
   const fullResult = typeof options.fullResult === 'boolean' ? options.fullResult : false;
   const wireVersion = maxWireVersion(server);

src/cmap/wire_protocol/query.ts

@@ -28,7 +28,7 @@ export function query(
   options: QueryOptions,
   callback: Callback
 ): void {
-  options = options || {};
+  options = options ?? {};
 
   const isExplain = typeof findCommand.$explain !== 'undefined';
   const readPreference = options.readPreference ?? ReadPreference.primary;

src/cmap/wire_protocol/write_command.ts

@@ -41,7 +41,7 @@ export function writeCommand(
     options = {};
   }
 
-  options = options || {};
+  options = options ?? {};
   const ordered = typeof options.ordered === 'boolean' ? options.ordered : true;
   const writeConcern = options.writeConcern;
   let writeCommand: Document = {};

src/collection.ts

@@ -585,7 +585,7 @@ export class Collection implements OperationParent {
     callback?: Callback<boolean>
   ): Promise<boolean> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     return executeOperation(
       getTopology(this),
@@ -1089,7 +1089,7 @@ export class Collection implements OperationParent {
     callback?: Callback<Document>
   ): Promise<Document> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     return executeOperation(getTopology(this), new CollStatsOperation(this, options), callback);
   }
@@ -1232,7 +1232,7 @@ export class Collection implements OperationParent {
   watch(pipeline?: Document[]): ChangeStream;
   watch(pipeline?: Document[], options?: ChangeStreamOptions): ChangeStream {
     pipeline = pipeline || [];
-    options = options || {};
+    options = options ?? {};
 
     // Allow optionally not specifying a pipeline
     if (!Array.isArray(pipeline)) {
@@ -1365,7 +1365,7 @@ export class Collection implements OperationParent {
     callback: Callback<Document>
   ): Promise<UpdateResult> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     return this.updateMany(selector, update, options, callback);
   }
@@ -1384,7 +1384,7 @@ export class Collection implements OperationParent {
     callback: Callback
   ): Promise<DeleteResult> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     return this.deleteMany(selector, options, callback);
   }

src/cursor/abstract_cursor.ts

@@ -329,7 +329,7 @@ export abstract class AbstractCursor extends EventEmitter {
   close(options: CursorCloseOptions, callback: Callback): void;
   close(options?: CursorCloseOptions | Callback, callback?: Callback): Promise<void> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     const needsToEmitClosed = !this[kClosed];
     this[kClosed] = true;

src/cursor/find_cursor.ts

@@ -120,7 +120,7 @@ export class FindCursor extends AbstractCursor {
     }
 
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     return executeOperation(
       this.topology,

src/db.ts

@@ -154,7 +154,7 @@ export class Db implements OperationParent {
    * @param options - Optional settings for Db construction
    */
   constructor(client: MongoClient, databaseName: string, options?: DbOptions) {
-    options = options || {};
+    options = options ?? {};
     emitDeprecatedOptionWarning(options, ['promiseLibrary']);
 
     // Filter the options
@@ -781,7 +781,7 @@ export class Db implements OperationParent {
   watch(pipeline?: Document[]): ChangeStream;
   watch(pipeline?: Document[], options?: ChangeStreamOptions): ChangeStream {
     pipeline = pipeline || [];
-    options = options || {};
+    options = options ?? {};
 
     // Allow optionally not specifying a pipeline
     if (!Array.isArray(pipeline)) {
@@ -887,7 +887,7 @@ export class Db implements OperationParent {
     callback?: Callback<Document[]>
   ): Promise<Document[]> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     const cursor = this.collection('system.profile').find({}, options);
     return callback ? cursor.toArray(callback) : cursor.toArray();

src/gridfs-stream/index.ts

@@ -142,7 +142,7 @@ export class GridFSBucket extends EventEmitter {
   /** Convenience wrapper around find on the files collection */
   find(filter: Document, options?: FindOptions): FindCursor {
     filter = filter || {};
-    options = options || {};
+    options = options ?? {};
     return this.s._filesCollection.find(filter, options);
   }
 

src/gridfs-stream/upload.ts

@@ -83,7 +83,7 @@ export class GridFSBucketWriteStream extends Writable {
   constructor(bucket: GridFSBucket, filename: string, options?: GridFSBucketWriteStreamOptions) {
     super();
 
-    options = options || {};
+    options = options ?? {};
     this.bucket = bucket;
     this.chunks = bucket.s._chunksCollection;
     this.filename = filename;

src/index.ts

@@ -224,7 +224,7 @@ export type {
   MapReduceOptions,
   FinalizeFunction
 } from './operations/map_reduce';
-export type { Hint, OperationOptions, OperationBase } from './operations/operation';
+export type { Hint, OperationOptions, AbstractOperation } from './operations/operation';
 export type { ProfilingLevelOptions } from './operations/profiling_level';
 export type { RemoveUserOptions } from './operations/remove_user';
 export type { RenameOptions } from './operations/rename';

src/logger.ts

@@ -42,7 +42,7 @@ export class Logger {
    * @param options - Optional logging settings
    */
   constructor(className: string, options?: LoggerOptions) {
-    options = options || {};
+    options = options ?? {};
 
     // Current reference
     this.className = className;

src/mongo_client.ts

@@ -386,7 +386,7 @@ export class MongoClient extends EventEmitter implements OperationParent {
   db(dbName: string): Db;
   db(dbName: string, options: DbOptions & { returnNonCachedInstance?: boolean }): Db;
   db(dbName: string, options?: DbOptions & { returnNonCachedInstance?: boolean }): Db {
-    options = options || {};
+    options = options ?? {};
 
     // Default to db from connection string if not provided
     if (!dbName && this.s.options?.dbName) {
@@ -437,7 +437,7 @@ export class MongoClient extends EventEmitter implements OperationParent {
     callback?: Callback<MongoClient>
   ): Promise<MongoClient> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ?? {};
 
     // Create client
     const mongoClient = new MongoClient(url, options);
@@ -527,7 +527,7 @@ export class MongoClient extends EventEmitter implements OperationParent {
   watch(pipeline?: Document[]): ChangeStream;
   watch(pipeline?: Document[], options?: ChangeStreamOptions): ChangeStream {
     pipeline = pipeline || [];
-    options = options || {};
+    options = options ?? {};
 
     // Allow optionally not specifying a pipeline
     if (!Array.isArray(pipeline)) {

src/operations/add_user.ts

@@ -6,6 +6,7 @@ import { Callback, getTopology } from '../utils';
 import type { Document } from '../bson';
 import type { Server } from '../sdam/server';
 import type { Db } from '../db';
+import type { ClientSession } from '../sessions';
 
 /** @public */
 export interface AddUserOptions extends CommandOperationOptions {
@@ -18,7 +19,8 @@ export interface AddUserOptions extends CommandOperationOptions {
 }
 
 /** @internal */
-export class AddUserOperation extends CommandOperation<AddUserOptions, Document> {
+export class AddUserOperation extends CommandOperation<Document> {
+  options: AddUserOptions;
   db: Db;
   username: string;
   password?: string;
@@ -35,9 +37,10 @@ export class AddUserOperation extends CommandOperation<AddUserOptions, Document>
     this.db = db;
     this.username = username;
     this.password = password;
+    this.options = options ?? {};
   }
 
-  execute(server: Server, callback: Callback<Document>): void {
+  execute(server: Server, session: ClientSession, callback: Callback<Document>): void {
     const db = this.db;
     const username = this.username;
     const password = this.password;
@@ -99,7 +102,7 @@ export class AddUserOperation extends CommandOperation<AddUserOptions, Document>
       command.pwd = userPassword;
     }
 
-    super.executeCommand(server, command, callback);
+    super.executeCommand(server, session, command, callback);
   }
 }
 

src/operations/aggregate.ts

@@ -7,6 +7,7 @@ import type { Callback } from '../utils';
 import type { Document } from '../bson';
 import type { Server } from '../sdam/server';
 import type { CollationOptions } from '../cmap/wire_protocol/write_command';
+import type { ClientSession } from '../sessions';
 
 /** @internal */
 export const DB_AGGREGATE_COLLECTION = 1 as const;
@@ -34,14 +35,16 @@ export interface AggregateOptions extends CommandOperationOptions {
 }
 
 /** @internal */
-export class AggregateOperation<T = Document> extends CommandOperation<AggregateOptions, T> {
+export class AggregateOperation<T = Document> extends CommandOperation<T> {
+  options: AggregateOptions;
   target: string | typeof DB_AGGREGATE_COLLECTION;
   pipeline: Document[];
   hasWriteStage: boolean;
 
   constructor(parent: OperationParent, pipeline: Document[], options?: AggregateOptions) {
     super(parent, options);
 
+    this.options = options ?? {};
     this.target =
       parent.s.namespace && parent.s.namespace.collection
         ? parent.s.namespace.collection
@@ -82,7 +85,7 @@ export class AggregateOperation<T = Document> extends CommandOperation<Aggregate
     this.pipeline.push(stage);
   }
 
-  execute(server: Server, callback: Callback<T>): void {
+  execute(server: Server, session: ClientSession, callback: Callback<T>): void {
     const options: AggregateOptions = this.options;
     const serverWireVersion = maxWireVersion(server);
     const command: Document = { aggregate: this.target, pipeline: this.pipeline };
@@ -114,7 +117,7 @@ export class AggregateOperation<T = Document> extends CommandOperation<Aggregate
       command.cursor.batchSize = options.batchSize;
     }
 
-    super.executeCommand(server, command, callback);
+    super.executeCommand(server, session, command, callback);
   }
 }