chore: Upgrade prettier version

Upgrade Prettier and reformat.

NODE-2680

Author: nbbeeken

.prettierrc .prettierrc.json

@@ -2,5 +2,6 @@
   "singleQuote": true,
   "tabWidth": 2,
   "printWidth": 100,
-  "arrowParens": "avoid"
+  "arrowParens": "avoid",
+  "trailingComma": "none"
 }

package-lock.json

@@ -52,7 +52,7 @@
     "mocha-sinon": "^2.1.0",
     "mongodb-mock-server": "^2.0.1",
     "nyc": "^15.0.0",
-    "prettier": "^1.19.1",
+    "prettier": "^2.0.5",
     "semver": "^5.5.0",
     "sinon": "^4.3.0",
     "sinon-chai": "^3.2.0",

package.json

@@ -1,4 +1,4 @@
-import * as _BSON from 'bson';
+import type * as _BSON from 'bson';
 let BSON: typeof _BSON = require('bson');
 try {
   BSON = require('bson-ext');

src/bson.ts

@@ -1261,7 +1261,7 @@ class BulkOperationBase {
 
 Object.defineProperty(BulkOperationBase.prototype, 'length', {
   enumerable: true,
-  get: function() {
+  get() {
     return this.s.currentIndex;
   }
 });

src/bulk/common.ts

@@ -50,15 +50,14 @@ function checkSupportedServer(ismaster: any, options: any) {
     return new MongoError(message);
   }
 
-  const message = `Server at ${options.host}:${
-    options.port
-  } reports maximum wire version ${ismaster.maxWireVersion ||
-    0}, but this version of the Node.js Driver requires at least ${MIN_SUPPORTED_WIRE_VERSION} (MongoDB ${MIN_SUPPORTED_SERVER_VERSION})`;
+  const message = `Server at ${options.host}:${options.port} reports maximum wire version ${
+    ismaster.maxWireVersion || 0
+  }, but this version of the Node.js Driver requires at least ${MIN_SUPPORTED_WIRE_VERSION} (MongoDB ${MIN_SUPPORTED_SERVER_VERSION})`;
   return new MongoError(message);
 }
 
 function performInitialHandshake(conn: any, options: any, _callback: any) {
-  const callback = function(err?: any, ret?: any) {
+  const callback = function (err?: any, ret?: any) {
     if (err && conn) {
       conn.destroy();
     }
@@ -205,11 +204,9 @@ function parseSslOptions(family: any, options: any) {
 
   // Override checkServerIdentity behavior
   if (options.checkServerIdentity === false) {
-    // Skip the identiy check by retuning undefined as per node documents
+    // Skip the identity check by retuning undefined as per node documents
     // https://nodejs.org/api/tls.html#tls_tls_connect_options_callback
-    result.checkServerIdentity = function() {
-      return undefined;
-    };
+    result.checkServerIdentity = () => undefined;
   } else if (typeof options.checkServerIdentity === 'function') {
     result.checkServerIdentity = options.checkServerIdentity;
   }
@@ -244,7 +241,7 @@ function makeConnection(family: any, options: any, cancellationToken: any, _call
   }
 
   let socket: any;
-  const callback = function(err?: any, ret?: any) {
+  const callback = function (err?: any, ret?: any) {
     if (err && socket) {
       socket.destroy();
     }

src/cmap/connect.ts

@@ -790,7 +790,7 @@ function nextFunction(self: any, callback: Function) {
     if (isConnectionDead(self, callback)) return;
 
     // Execute the next get more
-    self._getMore(function(err: any, doc: any, connection: any) {
+    self._getMore(function (err: any, doc: any, connection: any) {
       if (err) {
         return handleCallback(callback, err);
       }
@@ -866,9 +866,9 @@ function nextFunction(self: any, callback: Function) {
       // Ensure we kill the cursor on the server
       self.kill();
       // Set cursor in dead and notified state
-      return setCursorDeadAndNotified(self, function() {
-        handleCallback(callback, new MongoError(doc ? doc.$err : undefined));
-      });
+      return setCursorDeadAndNotified(self, () =>
+        handleCallback(callback, new MongoError(doc ? doc.$err : undefined))
+      );
     }
 
     // Transform the doc with passed in transformation method if provided

src/cursor/core_cursor.ts

@@ -1017,7 +1017,7 @@ class Cursor extends CoreCursor {
     if (typeof streamOptions.transform === 'function') {
       const stream = new Transform({
         objectMode: true,
-        transform: function(chunk: any, encoding: any, callback: Function) {
+        transform(chunk: any, encoding: any, callback: Function) {
           this.push(streamOptions.transform(chunk));
           callback();
         }

src/cursor/cursor.ts

@@ -7,9 +7,7 @@ import { commandSupportsReadConcern } from '../sessions';
 import { MongoError } from '../error';
 import Logger = require('../logger');
 
-/* eslint-disable */
 import type { Server } from '../sdam/server';
-/* eslint-enable */
 
 const SUPPORTS_WRITE_CONCERN_AND_COLLATION = 5;
 
@@ -41,7 +39,9 @@ class CommandOperation extends OperationBase {
     //       something we'd want to reconsider. Perhaps those commands can use `Admin`
     //       as a parent?
     const dbNameOverride = options?.dbName || options?.authdb;
-    this.ns = dbNameOverride ? new MongoDBNamespace(dbNameOverride, '$cmd') : parent.s.namespace.withCollection('$cmd');
+    this.ns = dbNameOverride
+      ? new MongoDBNamespace(dbNameOverride, '$cmd')
+      : parent.s.namespace.withCollection('$cmd');
 
     const propertyProvider = this.hasAspect(Aspect.NO_INHERIT_OPTIONS) ? undefined : parent;
     this.readPreference = ReadPreference.resolve(propertyProvider, this.options);

src/operations/command.ts

@@ -8,7 +8,7 @@ import {
   handleCallback
 } from '../utils';
 import { MongoError } from '../error';
-import { defineAspects, Aspect, OperationBase } from './operation';
+import { OperationBase } from './operation';
 
 class FindAndModifyOperation extends OperationBase {
   collection: any;

src/operations/find_and_modify.ts

@@ -18,10 +18,7 @@ class FindOneOperation extends OperationBase {
     const options = this.options;
 
     try {
-      const cursor = coll
-        .find(query, options)
-        .limit(-1)
-        .batchSize(1);
+      const cursor = coll.find(query, options).limit(-1).batchSize(1);
 
       // Return the item
       cursor.next((err?: any, item?: any) => {

src/operations/find_one.ts

@@ -3,8 +3,8 @@ import { defineAspects, Aspect } from './operation';
 import Db = require('../db');
 import Collection = require('../collection');
 import MongoClient = require('../mongo_client');
-import { Server } from '../sdam/server';
 import { MongoDBNamespace } from '../utils';
+import type { Server } from '../sdam/server';
 
 class RunCommandOperation extends CommandOperation {
   command: any;

src/operations/run_command.ts

@@ -15,7 +15,8 @@ import {
   ServerHeartbeatSucceededEvent,
   ServerHeartbeatFailedEvent
 } from './events';
-import { Server } from './server';
+
+import type { Server } from './server';
 
 const kServer = Symbol('server');
 const kMonitorId = Symbol('monitorId');

src/sdam/monitor.ts

@@ -407,10 +407,10 @@ class Server extends EventEmitter {
 }
 
 Object.defineProperty(Server.prototype, 'clusterTime', {
-  get: function() {
+  get() {
     return this.s.topology.clusterTime;
   },
-  set: function(clusterTime: any) {
+  set(clusterTime: any) {
     this.s.topology.clusterTime = clusterTime;
   }
 });

src/sdam/server.ts

@@ -10,12 +10,11 @@ const SMALLEST_MAX_STALENESS_SECONDS = 90;
  * Returns a server selector that selects for writable servers
  */
 function writableServerSelector() {
-  return function(topologyDescription: any, servers: any) {
-    return latencyWindowReducer(
+  return (topologyDescription: any, servers: any) =>
+    latencyWindowReducer(
       topologyDescription,
       servers.filter((s: any) => s.isWritable)
     );
-  };
 }
 
 /**
@@ -181,7 +180,7 @@ function readPreferenceServerSelector(readPreference: any) {
     throw new TypeError('Invalid read preference specified');
   }
 
-  return function(topologyDescription: any, servers: any) {
+  return function (topologyDescription: any, servers: any) {
     const commonWireVersion = topologyDescription.commonWireVersion;
     if (
       commonWireVersion &&

src/sdam/server_selection.ts

@@ -757,10 +757,10 @@ class Topology extends EventEmitter {
 
 Object.defineProperty(Topology.prototype, 'clusterTime', {
   enumerable: true,
-  get: function() {
+  get() {
     return this.s.clusterTime;
   },
-  set: function(clusterTime: any) {
+  set(clusterTime: any) {
     this.s.clusterTime = clusterTime;
   }
 });
@@ -1079,7 +1079,7 @@ function makeCompressionInfo(options: any) {
   }
 
   // Check that all supplied compressors are valid
-  options.compression.compressors.forEach(function(compressor: any) {
+  options.compression.compressors.forEach((compressor: any) => {
     if (compressor !== 'snappy' && compressor !== 'zlib') {
       throw new Error('compressors must be at least one of snappy or zlib');
     }
@@ -1095,7 +1095,7 @@ const RETRYABLE_WIRE_VERSION = 6;
  *
  * @param {Mongos|Replset} topology
  */
-const isRetryableWritesSupported = function(topology: any) {
+function isRetryableWritesSupported(topology: any) {
   const maxWireVersion = topology.lastIsMaster().maxWireVersion;
   if (maxWireVersion < RETRYABLE_WIRE_VERSION) {
     return false;
@@ -1110,6 +1110,6 @@ const isRetryableWritesSupported = function(topology: any) {
   }
 
   return true;
-};
+}
 
 export { Topology };