refactor: use named exports for all SDAM types

Author: mbroadst

lib/core/index.js

@@ -33,7 +33,7 @@ module.exports = {
   Sessions: require('./sessions'),
   BSON: BSON,
   EJSON: EJSON,
-  Topology: require('./sdam/topology'),
+  Topology: require('./sdam/topology').Topology,
   // Raw operations
   Query: require('./connection/commands').Query,
   // Auth mechanisms

lib/core/sdam/monitoring.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const ServerDescription = require('./server_description');
+const ServerDescription = require('./server_description').ServerDescription;
 const calculateDurationInMs = require('../utils').calculateDurationInMs;
 
 // pulled from `Server` implementation

lib/core/sdam/server.js

@@ -7,7 +7,7 @@ const wireProtocol = require('../wireprotocol');
 const BSON = require('../connection/utils').retrieveBSON();
 const createClientInfo = require('../topologies/shared').createClientInfo;
 const Logger = require('../connection/logger');
-const ServerDescription = require('./server_description');
+const ServerDescription = require('./server_description').ServerDescription;
 const ReadPreference = require('../topologies/read_preference');
 const monitorServer = require('./monitoring').monitorServer;
 const MongoParseError = require('../error').MongoParseError;
@@ -545,4 +545,6 @@ function parseErrorEventHandler(server) {
   };
 }
 
-module.exports = Server;
+module.exports = {
+  Server
+};

lib/core/sdam/server_description.js

@@ -174,4 +174,6 @@ function parseServerType(ismaster) {
   return ServerType.Standalone;
 }
 
-module.exports = ServerDescription;
+module.exports = {
+  ServerDescription
+};

lib/core/sdam/topology.js

@@ -1,11 +1,11 @@
 'use strict';
 const EventEmitter = require('events');
-const ServerDescription = require('./server_description');
+const ServerDescription = require('./server_description').ServerDescription;
 const ServerType = require('./common').ServerType;
-const TopologyDescription = require('./topology_description');
+const TopologyDescription = require('./topology_description').TopologyDescription;
 const TopologyType = require('./common').TopologyType;
 const monitoring = require('./monitoring');
-const Server = require('./server');
+const Server = require('./server').Server;
 const relayEvents = require('../utils').relayEvents;
 const ReadPreference = require('../topologies/read_preference');
 const isRetryableWritesSupported = require('../topologies/shared').isRetryableWritesSupported;
@@ -1141,4 +1141,6 @@ function srvPollingHandler(topology) {
  * @type {object}
  */
 
-module.exports = Topology;
+module.exports = {
+  Topology
+};

lib/core/sdam/topology_description.js

@@ -1,6 +1,6 @@
 'use strict';
 const ServerType = require('./common').ServerType;
-const ServerDescription = require('./server_description');
+const ServerDescription = require('./server_description').ServerDescription;
 const WIRE_CONSTANTS = require('../wireprotocol/constants');
 const TopologyType = require('./common').TopologyType;
 
@@ -396,4 +396,6 @@ function checkHasPrimary(serverDescriptions) {
   return TopologyType.ReplicaSetNoPrimary;
 }
 
-module.exports = TopologyDescription;
+module.exports = {
+  TopologyDescription
+};

lib/core/wireprotocol/shared.js

@@ -3,7 +3,7 @@
 const ReadPreference = require('../topologies/read_preference');
 const MongoError = require('../error').MongoError;
 const ServerType = require('../sdam/common').ServerType;
-const TopologyDescription = require('../sdam/topology_description');
+const TopologyDescription = require('../sdam/topology_description').TopologyDescription;
 
 const MESSAGE_HEADER_SIZE = 16;
 const COMPRESSION_DETAILS_SIZE = 9; // originalOpcode + uncompressedSize, compressorID

test/core/functional/replset_server_selection_tests.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var expect = require('chai').expect,
-  f = require('util').format,
   fs = require('fs'),
+  p = require('path'),
   ReplSetState = require('../../../lib/core/topologies/replset_state'),
   MongoError = require('../../../lib/core/error').MongoError,
   ReadPreference = require('../../../lib/core/topologies/read_preference');
@@ -18,17 +18,17 @@ describe('A replicaset with no primary', function() {
 
     test: function(done) {
       const config = this.configuration;
-      var path = f(
-        '%s/../spec/server-selection/server_selection/ReplicaSetNoPrimary/read',
-        __dirname
+      var path = p.resolve(
+        __dirname,
+        '../../spec/server-selection/server_selection/ReplicaSetNoPrimary/read'
       );
       var entries = fs.readdirSync(path).filter(function(x) {
         return x.indexOf('.json') !== -1;
       });
 
       // Execute each of the entries
       entries.forEach(function(x) {
-        executeEntry(config, x, f('%s/%s', path, x));
+        executeEntry(config, x, `${path}/${x}`);
       });
 
       done();
@@ -47,17 +47,18 @@ describe('A replicaset with a primary', function() {
 
     test: function(done) {
       const config = this.configuration;
-      var path = f(
-        '%s/../spec/server-selection/server_selection/ReplicaSetWithPrimary/read',
-        __dirname
+      var path = p.resolve(
+        __dirname,
+        '../../spec/server-selection/server_selection/ReplicaSetWithPrimary/read'
       );
+
       var entries = fs.readdirSync(path).filter(function(x) {
         return x.indexOf('.json') !== -1;
       });
 
       // Execute each of the entries
       entries.forEach(function(x) {
-        executeEntry(config, x, f('%s/%s', path, x));
+        executeEntry(config, x, `${path}/${x}`);
       });
 
       done();

test/core/functional/srv_polling_tests.js

@@ -1,7 +1,8 @@
 'use strict';
 
-const Topology = require('../../../lib/core/sdam/topology');
-const TopologyDescription = require('../../../lib/core/sdam/topology_description');
+const Topology = require('../../../lib/core/sdam/topology').Topology;
+const TopologyDescription = require('../../../lib/core/sdam/topology_description')
+  .TopologyDescription;
 const TopologyType = require('../../../lib/core/sdam/common').TopologyType;
 const monitoring = require('../../../lib/core/sdam/monitoring');
 const SrvPoller = require('../../../lib/core/sdam/srv_polling').SrvPoller;

test/core/unit/sdam_spec_tests.js

@@ -3,9 +3,9 @@ const fs = require('fs');
 const path = require('path');
 const chai = require('chai');
 const expect = chai.expect;
-const Topology = require('../../../lib/core/sdam/topology');
-const Server = require('../../../lib/core/sdam/server');
-const ServerDescription = require('../../../lib/core/sdam/server_description');
+const Topology = require('../../../lib/core/sdam/topology').Topology;
+const Server = require('../../../lib/core/sdam/server').Server;
+const ServerDescription = require('../../../lib/core/sdam/server_description').ServerDescription;
 const monitoring = require('../../../lib/core/sdam/monitoring');
 const parse = require('../../../lib/core/uri_parser');
 chai.use(require('chai-subset'));