remove top-level wc options

Author: HanaPearlman

src/cmap/wire_protocol/command.ts

@@ -8,11 +8,12 @@ import type { Document, BSONSerializeOptions } from '../../bson';
 import type { Server } from '../../sdam/server';
 import type { Topology } from '../../sdam/topology';
 import type { ReadPreferenceLike } from '../../read_preference';
-import type { WriteConcernOptions, WriteConcern, W } from '../../write_concern';
+import type { WriteConcernOptions } from '../../write_concern';
 import type { WriteCommandOptions } from './write_command';
 
 /** @internal */
-export interface CommandOptions extends BSONSerializeOptions {
+// FIXME: NODE-2781
+export interface CommandOptions extends BSONSerializeOptions, WriteConcernOptions {
   command?: boolean;
   slaveOk?: boolean;
   /** Specify read preference if command supports it */
@@ -28,9 +29,6 @@ export interface CommandOptions extends BSONSerializeOptions {
 
   // FIXME: NODE-2802
   willRetryWrite?: boolean;
-
-  // FIXME: NODE-2781
-  writeConcern?: WriteConcernOptions | WriteConcern | W;
 }
 
 function isClientEncryptionEnabled(server: Server) {

src/db.ts

@@ -60,10 +60,7 @@ import type { Admin } from './admin';
 
 // Allowed parameters
 const legalOptionNames = [
-  'w',
-  'wtimeout',
-  'fsync',
-  'j',
+  'writeConcern',
   'readPreference',
   'readPreferenceTags',
   'native_parser',

src/gridfs-stream/upload.ts

@@ -515,9 +515,9 @@ function doWrite(
 function getWriteOptions(stream: GridFSBucketWriteStream): WriteConcernOptions {
   const obj: WriteConcernOptions = {};
   if (stream.writeConcern) {
-    obj.w = stream.writeConcern.w;
-    obj.wtimeout = stream.writeConcern.wtimeout;
-    obj.j = stream.writeConcern.j;
+    obj.writeConcern = { w: stream.writeConcern.w };
+    obj.writeConcern.wtimeout = stream.writeConcern.wtimeout;
+    obj.writeConcern.j = stream.writeConcern.j;
   }
   return obj;
 }

src/mongo_client.ts

@@ -3,7 +3,7 @@ import { EventEmitter } from 'events';
 import { ChangeStream, ChangeStreamOptions } from './change_stream';
 import { ReadPreference, ReadPreferenceMode } from './read_preference';
 import { MongoError, AnyError } from './error';
-import { WriteConcern, WriteConcernOptions } from './write_concern';
+import { WriteConcern, WriteConcernOptions, W } from './write_concern';
 import { maybePromise, MongoDBNamespace, Callback, resolveOptions } from './utils';
 import { deprecate } from 'util';
 import { connect, validOptions } from './operations/connect';
@@ -58,7 +58,7 @@ type CleanUpHandlerFunction = (err?: AnyError, result?: any, opts?: any) => Prom
  * @public
  * @see https://docs.mongodb.com/manual/reference/connection-string
  */
-export interface MongoURIOptions extends Pick<WriteConcernOptions, 'journal' | 'w' | 'wtimeoutMS'> {
+export interface MongoURIOptions {
   /** Specifies the name of the replica set, if the mongod is a member of a replica set. */
   replicaSet?: string;
   /** Enables or disables TLS/SSL for the connection. */
@@ -131,6 +131,13 @@ export interface MongoURIOptions extends Pick<WriteConcernOptions, 'journal' | '
   retryWrites?: boolean;
   /** Allow a driver to force a Single topology type with a connection string containing one host */
   directConnection?: boolean;
+  // TODO: but now mongo client options accept these at the top level...
+  /** The journal write concern */
+  journal?: boolean;
+  /** The write concern */
+  w?: W;
+  /** The write concern timeout */
+  wtimeoutMS?: number;
 }
 
 /** @public */

src/operations/connect.ts

@@ -51,9 +51,7 @@ const validOptionNames = [
   'acceptableLatencyMS',
   'connectWithNoPrimary',
   'authSource',
-  'w',
-  'wtimeout',
-  'j',
+  'writeConcern',
   'forceServerObjectId',
   'serializeFunctions',
   'ignoreUndefined',
@@ -78,7 +76,6 @@ const validOptionNames = [
   'password',
   'authMechanism',
   'compression',
-  'fsync',
   'readPreferenceTags',
   'numberOfRetries',
   'auto_reconnect',
@@ -226,12 +223,6 @@ export function connect(
       delete finalOptions.db_options.auth;
     }
 
-    // `journal` should be translated to `j` for the driver
-    if (finalOptions.journal != null) {
-      finalOptions.j = finalOptions.journal;
-      finalOptions.journal = undefined;
-    }
-
     // resolve tls options if needed
     resolveTLSOptions(finalOptions);
 
@@ -422,7 +413,9 @@ function createUnifiedOptions(finalOptions: any, options: any) {
   const noMerge = ['readconcern', 'compression', 'autoencryption'];
 
   for (const name in options) {
-    if (noMerge.indexOf(name.toLowerCase()) !== -1) {
+    if (name === 'writeConcern') {
+      finalOptions[name] = { ...finalOptions[name], ...options[name] };
+    } else if (noMerge.indexOf(name.toLowerCase()) !== -1) {
       finalOptions[name] = options[name];
     } else if (childOptions.indexOf(name.toLowerCase()) !== -1) {
       finalOptions = mergeOptions(finalOptions, options[name], false);
@@ -559,14 +552,23 @@ function transformUrlOptions(connStrOptions: any) {
     connStrOpts.readConcern = new ReadConcern(connStrOpts.readConcernLevel);
   }
 
-  if (connStrOpts.wTimeoutMS) {
-    connStrOpts.wtimeout = connStrOpts.wTimeoutMS;
-  }
-
   if (connStrOptions.srvHost) {
     connStrOpts.srvHost = connStrOptions.srvHost;
   }
 
+  const wc_keys = ['w', 'j', 'journal', 'wtimeout', 'wtimeoutMS', 'fsync'];
+  const writeConcern = connStrOpts.writeConcern ?? {};
+  for (const key of wc_keys) {
+    if (connStrOpts[key] !== undefined) {
+      writeConcern[key] = connStrOpts[key];
+      connStrOpts[key] = undefined;
+    }
+  }
+  connStrOpts.writeConcern = writeConcern;
+
+  if (connStrOpts.writeConcern.wTimeoutMS) {
+    connStrOpts.writrConcern.wtimeout = connStrOpts.writeConcern.wTimeoutMS;
+  }
   return connStrOpts;
 }
 

src/write_concern.ts

@@ -3,6 +3,12 @@ export type W = number | 'majority';
 
 /** @public */
 export interface WriteConcernOptions {
+  /** Write Concern as an object */
+  writeConcern?: WriteConcern | WriteConcernSettings;
+}
+
+/** @public */
+export interface WriteConcernSettings {
   /** The write concern */
   w?: W;
   /** The write concern timeout */
@@ -15,12 +21,8 @@ export interface WriteConcernOptions {
   journal?: boolean;
   /** The file sync write concern */
   fsync?: boolean | 1;
-  /** Write Concern as an object */
-  writeConcern?: WriteConcernOptions | WriteConcern | W;
 }
 
-export const writeConcernKeys = ['w', 'j', 'wtimeout', 'fsync'];
-
 /**
  * A MongoDB WriteConcern, which describes the level of acknowledgement
  * requested from MongoDB for write operations.
@@ -65,19 +67,17 @@ export class WriteConcern {
 
   /** Construct a WriteConcern given an options object. */
   static fromOptions(
-    options?: WriteConcernOptions | WriteConcern | W,
+    options?: WriteConcernOptions | WriteConcern,
     inherit?: WriteConcernOptions | WriteConcern
   ): WriteConcern | undefined {
-    const { fromOptions } = WriteConcern;
     if (typeof options === 'undefined') return undefined;
-    if (typeof options === 'number') return fromOptions({ ...inherit, w: options });
-    if (typeof options === 'string') return fromOptions({ ...inherit, w: options });
-    if (options instanceof WriteConcern) return fromOptions({ ...inherit, ...options });
-    if (options.writeConcern) {
-      const { writeConcern, ...viable } = { ...inherit, ...options };
-      return fromOptions(writeConcern, viable);
-    }
-    const { w, wtimeout, j, fsync, journal, wtimeoutMS } = { ...inherit, ...options };
+    inherit = inherit ?? {};
+    const opts: WriteConcern | WriteConcernSettings | undefined =
+      options instanceof WriteConcern ? options : options.writeConcern;
+    const parentOpts: WriteConcern | WriteConcernSettings | undefined =
+      inherit instanceof WriteConcern ? inherit : inherit.writeConcern;
+
+    const { w, wtimeout, j, fsync, journal, wtimeoutMS } = { ...parentOpts, ...opts };
     if (
       w != null ||
       wtimeout != null ||
@@ -88,6 +88,7 @@ export class WriteConcern {
     ) {
       return new WriteConcern(w, wtimeout ?? wtimeoutMS, j ?? journal, fsync);
     }
+
     return undefined;
   }
 }