rebase fixes

Author: nbbeeken

src/cmap/wire_protocol/command.ts

@@ -9,9 +9,11 @@ import type { Server } from '../../sdam/server';
 import type { Topology } from '../../sdam/topology';
 import type { ReadPreferenceLike } from '../../read_preference';
 import type { WriteCommandOptions } from './write_command';
+import type { WriteConcernOptions } from '../../write_concern';
 
 /** @public */
-export interface CommandOptions extends BSONSerializeOptions {
+export interface CommandOptions extends BSONSerializeOptions, WriteConcernOptions {
+  // FIXME: NODE-2781
   command?: boolean;
   slaveOk?: boolean;
   /** Specify read preference if command supports it */

src/index.ts

@@ -294,7 +294,7 @@ export type {
   MongoDBNamespace,
   InterruptableAsyncInterval
 } from './utils';
-export type { WriteConcern, W, WriteConcernOptions } from './write_concern';
+export type { WriteConcern, W, WriteConcernOptions, WriteConcernSettings } from './write_concern';
 export type { ExecutionResult } from './operations/execute_operation';
 export type { InternalAbstractCursorOptions } from './cursor/abstract_cursor';
 export type {