small cleanup

Author: HanaPearlman

src/cmap/wire_protocol/command.ts

@@ -12,8 +12,9 @@ import type { WriteConcernOptions } from '../../write_concern';
 import type { WriteCommandOptions } from './write_command';
 
 /** @internal */
-// FIXME: NODE-2781
 export interface CommandOptions extends BSONSerializeOptions, WriteConcernOptions {
+  // FIXME: NODE-2781
+
   command?: boolean;
   slaveOk?: boolean;
   /** Specify read preference if command supports it */

src/gridfs-stream/upload.ts

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

src/mongo_client.ts

@@ -127,7 +127,6 @@ export interface MongoURIOptions {
   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 */

src/operations/connect.ts

@@ -552,23 +552,26 @@ function transformUrlOptions(connStrOptions: any) {
     connStrOpts.readConcern = new ReadConcern(connStrOpts.readConcernLevel);
   }
 
+  if (connStrOpts.wTimeoutMS) {
+    connStrOpts.wtimeout = connStrOpts.wTimeoutMS;
+    connStrOpts.wTimeoutMS = undefined;
+  }
+
   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) {
+  // Any write concern options from the URL will be top-level, so we manually
+  // move them options under `object.writeConcern`
+  const wcKeys = ['w', 'wtimeout', 'j', 'journal', 'fsync'];
+  for (const key of wcKeys) {
     if (connStrOpts[key] !== undefined) {
-      writeConcern[key] = connStrOpts[key];
+      if (connStrOpts.writeConcern === undefined) connStrOpts.writeConcern = {};
+      connStrOpts.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

@@ -88,7 +88,6 @@ export class WriteConcern {
     ) {
       return new WriteConcern(w, wtimeout ?? wtimeoutMS, j ?? journal, fsync);
     }
-
     return undefined;
   }
 }

test/tools/runner/config.js

@@ -33,7 +33,7 @@ class NativeConfiguration {
     );
 
     this.writeConcern = function () {
-      return { writeConcern: { w: 1 } }; //TODO HANA
+      return { writeConcern: { w: 1 } };
     };
   }