feat(data-service): split DataService into interface/implementation

packages/compass-aggregations/electron/renderer/index.jsx

@@ -32,7 +32,7 @@ document.body.appendChild(root);
 
 // // Data service initialization and connection.
 import Connection from 'mongodb-connection-model';
-import { DataService } from 'mongodb-data-service';
+import { DataServiceImpl } from 'mongodb-data-service';
 
 const localAppRegistry = new AppRegistry();
 const store = configureStore({
@@ -71,7 +71,7 @@ const connection = new Connection({
   port: 27017,
   ns: 'admin'
 });
-const dataService = new DataService(connection);
+const dataService = new DataServiceImpl(connection);
 
 dataService.connect((error, ds) => {
   appRegistry.emit('data-service-connected', error, ds);

packages/compass-app-stores/electron/renderer/index.js

@@ -50,13 +50,13 @@ render(ComponentPlugin);
 
 // // Data service initialization and connection.
 import Connection from 'mongodb-connection-model';
-import { DataService } from 'mongodb-data-service';
+import { DataServiceImpl } from 'mongodb-data-service';
 
 const connection = new Connection({
   hostname: '127.0.0.1',
   port: 27017
 });
-const dataService = new DataService(connection);
+const dataService = new DataServiceImpl(connection);
 
 appRegistry.emit('data-service-initialized', dataService);
 dataService.connect((error, ds) => {

packages/compass-auto-updates/electron/renderer/index.js

@@ -55,7 +55,7 @@ remote.getCurrentWebContents().send('app:update-available', {
 
 // // Data service initialization and connection.
 // import Connection from 'mongodb-connection-model';
-// import { DataService } from 'mongodb-data-service';
+// import { DataServiceImpl } from 'mongodb-data-service';
 //
 // const connection = new Connection({
 //   hostname: '127.0.0.1',
@@ -65,7 +65,7 @@ remote.getCurrentWebContents().send('app:update-available', {
 //   mongodb_username: '<user>',
 //   mongodb_password: '<password>'
 // });
-// const dataService = new DataService(connection);
+// const dataService = new DataServiceImpl(connection);
 //
 // appRegistry.emit('data-service-initialized', dataService);
 // dataService.connect((error, ds) => {

packages/compass-crud/electron/renderer/index.js

@@ -86,15 +86,15 @@ render(ConnectedDocumentList);
 
 // // Data service initialization and connection.
 import Connection from 'mongodb-connection-model';
-import { DataService } from 'mongodb-data-service';
+import { DataServiceImpl } from 'mongodb-data-service';
 
 const connection = new Connection({
   hostname: '127.0.0.1',
   port: 27017,
   ns: DB,
   mongodb_database_name: 'admin'
 });
-const dataService = new DataService(connection);
+const dataService = new DataServiceImpl(connection);
 
 appRegistry.emit('data-service-initialized', dataService);
 

packages/compass-database/electron/renderer/index.js

@@ -58,7 +58,7 @@ render(DatabasePlugin);
 
 // // Data service initialization and connection.
 // import Connection from 'mongodb-connection-model';
-// import { DataService } from 'mongodb-data-service';
+// import { DataServiceImpl } from 'mongodb-data-service';
 //
 // const connection = new Connection({
 //   hostname: '127.0.0.1',
@@ -68,7 +68,7 @@ render(DatabasePlugin);
 //   mongodb_username: '<user>',
 //   mongodb_password: '<password>'
 // });
-// const dataService = new DataService(connection);
+// const dataService = new DataServiceImpl(connection);
 //
 // appRegistry.emit('data-service-initialized', dataService);
 // dataService.connect((error, ds) => {

packages/compass-deployment-awareness/electron/renderer/index.js

@@ -10,7 +10,7 @@ import app from 'hadron-app';
 import AppRegistry from 'hadron-app-registry';
 import { AppContainer } from 'react-hot-loader';
 import DeploymentAwarenessPlugin, { activate } from '../../src/index.js';
-import { DataService } from 'mongodb-data-service';
+import { DataServiceImpl } from 'mongodb-data-service';
 import Connection from 'mongodb-connection-model';
 
 const appRegistry = new AppRegistry();
@@ -50,7 +50,7 @@ const render = Component => {
 // Render our plugin - don't remove the following line.
 render(DeploymentAwarenessPlugin);
 
-const dataService = new DataService(CONNECTION);
+const dataService = new DataServiceImpl(CONNECTION);
 
 dataService.connect((error, ds) => {
   global.hadronApp.dataService = ds;

packages/compass-explain-plan/electron/renderer/index.js

@@ -79,14 +79,14 @@ render(ExplainPlanPlugin);
 
 // Data service initialization and connection
 import Connection from 'mongodb-connection-model';
-import { DataService } from 'mongodb-data-service';
+import { DataServiceImpl } from 'mongodb-data-service';
 
 const connection = new Connection({
   hostname: '127.0.0.1',
   port: 27017,
   ns: 'admin'
 });
-const dataService = new DataService(connection);
+const dataService = new DataServiceImpl(connection);
 
 appRegistry.emit('data-service-initialized', dataService);
 

packages/compass-export-to-language/electron/renderer/index.js

@@ -53,13 +53,13 @@ render(ExportToLanguageStandalone);
 
 // // Data service initialization and connection.
 import Connection from 'mongodb-connection-model';
-import { DataService } from 'mongodb-data-service';
+import { DataServiceImpl } from 'mongodb-data-service';
 
 const connection = new Connection({
   hostname: '127.0.0.1',
   port: 27017
 });
-const dataService = new DataService(connection);
+const dataService = new DataServiceImpl(connection);
 
 dataService.connect((error, ds) => {
   appRegistry.emit('data-service-connected', error, ds);

packages/compass-field-store/electron/renderer/index.js

@@ -48,7 +48,7 @@ render(ComponentPlugin);
 
 // // Data service initialization and connection.
 // import Connection from 'mongodb-connection-model';
-// import { DataService } from 'mongodb-data-service';
+// import { DataServiceImpl } from 'mongodb-data-service';
 //
 // const connection = new Connection({
 //   hostname: '127.0.0.1',
@@ -58,7 +58,7 @@ render(ComponentPlugin);
 //   mongodb_username: '<user>',
 //   mongodb_password: '<password>'
 // });
-// const dataService = new DataService(connection);
+// const dataService = new DataServiceImpl(connection);
 //
 // appRegistry.emit('data-service-initialized', dataService);
 // dataService.connect((error, ds) => {

packages/compass-import-export/src/modules/export.spec.js

@@ -9,7 +9,7 @@ import AppRegistry from 'hadron-app-registry';
 import FILE_TYPES from '../constants/file-types';
 import reducer, * as actions from './export';
 import store from '../stores/export-store';
-import { DataService } from 'mongodb-data-service';
+import { DataServiceImpl } from 'mongodb-data-service';
 import { promisify } from 'util';
 import { once } from 'events';
 import { dataServiceConnected, globalAppRegistryActivated } from './compass';
@@ -21,7 +21,7 @@ describe('export [module]', function () {
   describe('#reducer', function () {
     context('#startExport', function () {
       const globalAppRegistry = new AppRegistry();
-      const dataService = new DataService({
+      const dataService = new DataServiceImpl({
         connectionString: 'mongodb://localhost:27018/local',
       });
       const createCollection = promisify(dataService.createCollection).bind(

packages/compass-instance/electron/renderer/index.js

@@ -50,7 +50,7 @@ render(InstancePlugin);
 
 // // Data service initialization and connection.
 // import Connection from 'mongodb-connection-model';
-// import { DataService } from 'mongodb-data-service';
+// import { DataServiceImpl } from 'mongodb-data-service';
 //
 // const connection = new Connection({
 //   hostname: '127.0.0.1',
@@ -60,7 +60,7 @@ render(InstancePlugin);
 //   mongodb_username: '<user>',
 //   mongodb_password: '<password>'
 // });
-// const dataService = new DataService(connection);
+// const dataService = new DataServiceImpl(connection);
 //
 // appRegistry.emit('data-service-initialized', dataService);
 // dataService.connect((error, ds) => {

packages/compass-schema-validation/electron/renderer/index.js

@@ -61,14 +61,14 @@ render(CompassSchemaValidationPlugin);
 
 // Data service initialization and connection.
 import Connection from 'mongodb-connection-model';
-import { DataService } from 'mongodb-data-service';
+import { DataServiceImpl } from 'mongodb-data-service';
 
 const connection = new Connection({
   hostname: '127.0.0.1',
   port: 27017,
   ns: 'admin'
 });
-const dataService = new DataService(connection);
+const dataService = new DataServiceImpl(connection);
 
 dataService.connect((error, ds) => {
   setDataProvider(store, error, ds);

packages/compass-server-version/electron/renderer/index.js

@@ -59,7 +59,7 @@ render(ServerVersionPlugin);
 
 // // Data service initialization and connection.
 // import Connection from 'mongodb-connection-model';
-// import { DataService } from 'mongodb-data-service';
+// import { DataServiceImpl } from 'mongodb-data-service';
 //
 // const connection = new Connection({
 //   hostname: '127.0.0.1',
@@ -69,7 +69,7 @@ render(ServerVersionPlugin);
 //   mongodb_username: '<user>',
 //   mongodb_password: '<password>'
 // });
-// const dataService = new DataService(connection);
+// const dataService = new DataServiceImpl(connection);
 //
 // appRegistry.emit('data-service-initialized', dataService);
 // dataService.connect((error, ds) => {

packages/compass-serverstats/electron/renderer/index.js

@@ -5,7 +5,7 @@ import 'mongodb-compass/src/app/styles/index.less';
 
 const React = require('react');
 const ReactDOM = require('react-dom');
-const { DataService } = require('mongodb-data-service');
+const { DataServiceImpl } = require('mongodb-data-service');
 const Connection = require('mongodb-connection-model');
 const app = require('hadron-app');
 const { AppRegistry } = require('hadron-app-registry');
@@ -38,7 +38,7 @@ global.hadronApp.appRegistry.registerStore(
 global.hadronApp.appRegistry.registerStore('RTSS.TopStore', TopStore);
 global.hadronApp.instance = { host: { cpu_cores: 4 } };
 
-const dataService = new DataService(CONNECTION);
+const dataService = new DataServiceImpl(CONNECTION);
 dataService.connect((error, ds) => {
   global.hadronApp.appRegistry.onActivated();
   global.hadronApp.appRegistry.emit('data-service-connected', error, ds);

packages/compass-sidebar/electron/renderer/index.js

@@ -58,7 +58,7 @@ render(SidebarPlugin);
 
 // Data service initialization and connection.
 import Connection from 'mongodb-connection-model';
-import { DataService } from 'mongodb-data-service';
+import { DataServiceImpl } from 'mongodb-data-service';
 
 const connection = new Connection({
   hostname: '127.0.0.1',
@@ -70,7 +70,7 @@ const connection = new Connection({
   readPreference: 'primaryPreferred',
   attributes: { hostanme: 'localhost' }
 });
-const dataService = new DataService(connection);
+const dataService = new DataServiceImpl(connection);
 
 global.hadronApp.instance.genuineMongoDB = { isGenuine: false, dbType: 'cosmos' };
 

packages/compass-ssh-tunnel-status/electron/renderer/index.js

@@ -46,15 +46,15 @@ render(SshTunnelStatusPlugin);
 
 // // Data service initialization and connection.
 import Connection from 'mongodb-connection-model';
-import { DataService } from 'mongodb-data-service';
+import { DataServiceImpl } from 'mongodb-data-service';
 
 const connection = new Connection({
   hostname: '127.0.0.1',
   port: 27017,
   ns: 'databaseName',
   mongodb_database_name: 'admin'
 });
-const dataService = new DataService(connection);
+const dataService = new DataServiceImpl(connection);
 
 appRegistry.emit('data-service-initialized', dataService);
 dataService.connect((error, ds) => {

packages/compass/test/unit/support/mock-data-service.js

@@ -1,7 +1,7 @@
 const sinon = require('sinon');
 const app = require('hadron-app');
 const _ = require('lodash');
-const { DataService } = require('mongodb-data-service');
+const { DataServiceImpl } = require('mongodb-data-service');
 
 /**
  * wraps the mocked callbacks and returns either cb(err) or cb(null, res)
@@ -65,7 +65,7 @@ function callbackWrapper(cb, err, res) {
 const mockDataService = function(errors, results) {
   errors = errors || {};
   results = results || {};
-  const dataService = new DataService({});
+  const dataService = new DataServiceImpl({});
   // extract all method names from real data-service
   const methodNames = Object.getOwnPropertyNames(Object.getPrototypeOf(dataService));
   // create new object with all methods, but mock spy functions that return

packages/data-service/src/connect.ts

@@ -1,10 +1,11 @@
 import type { ConnectionOptions } from './connection-options';
-import DataService from './data-service';
+import type { DataService } from './data-service';
+import { DataServiceImpl } from './data-service';
 
 export default async function connect(
   connectionOptions: ConnectionOptions
 ): Promise<DataService> {
-  const dataService = new DataService(connectionOptions);
+  const dataService = new DataServiceImpl(connectionOptions);
   await dataService.connect();
   return dataService;
 }

packages/data-service/src/data-service.spec.ts

@@ -6,7 +6,8 @@ import { MongoClient } from 'mongodb';
 import sinon from 'sinon';
 import { v4 as uuid } from 'uuid';
 
-import DataService from './data-service';
+import type { DataService } from './data-service';
+import { DataServiceImpl } from './data-service';
 import type {
   ConnectionFleOptions,
   ConnectionOptions,
@@ -47,7 +48,7 @@ describe('DataService', function () {
       mongoClient = new MongoClient(connectionOptions.connectionString);
       await mongoClient.connect();
 
-      dataService = new DataService(connectionOptions);
+      dataService = new DataServiceImpl(connectionOptions);
       await dataService.connect();
     });
 
@@ -85,18 +86,18 @@ describe('DataService', function () {
       });
 
       it('returns false when not connected initially', function () {
-        dataServiceIsConnected = new DataService(connectionOptions);
+        dataServiceIsConnected = new DataServiceImpl(connectionOptions);
         expect(dataServiceIsConnected.isConnected()).to.equal(false);
       });
 
       it('returns true if client is connected', async function () {
-        dataServiceIsConnected = new DataService(connectionOptions);
+        dataServiceIsConnected = new DataServiceImpl(connectionOptions);
         await dataServiceIsConnected.connect();
         expect(dataServiceIsConnected.isConnected()).to.equal(true);
       });
 
       it('returns false if client is disconnected', async function () {
-        dataServiceIsConnected = new DataService(connectionOptions);
+        dataServiceIsConnected = new DataServiceImpl(connectionOptions);
 
         await dataServiceIsConnected.connect();
         await dataServiceIsConnected.disconnect();
@@ -107,7 +108,7 @@ describe('DataService', function () {
 
     describe('#setupListeners', function () {
       it('emits log events for MongoClient heartbeat events', function () {
-        const dataService: any = new DataService(null as any);
+        const dataService: any = new DataServiceImpl(null as any);
         const client: Pick<MongoClient, 'on' | 'emit'> =
           new EventEmitter() as any;
         const logEntries: any[] = [];
@@ -1017,7 +1018,7 @@ describe('DataService', function () {
       });
 
       it("it returns null when a topology description event hasn't yet occured", function () {
-        const testService = new DataService(connectionOptions);
+        const testService = new DataServiceImpl(connectionOptions);
         expect(testService.getLastSeenTopology()).to.equal(null);
       });
     });
@@ -1364,7 +1365,9 @@ describe('DataService', function () {
             },
           },
         };
-        expect(dataService._csfleLogInformation(fleOptions)).to.deep.equal({
+        expect(
+          (dataService as DataServiceImpl)._csfleLogInformation(fleOptions)
+        ).to.deep.equal({
           storeCredentials: false,
           keyVaultNamespace: 'abc.def',
           schemaMapNamespaces: ['a.b'],
@@ -1376,7 +1379,7 @@ describe('DataService', function () {
 
   context('with mocked client', function () {
     function createDataServiceWithMockedClient(clientConfig) {
-      const dataService = new DataService({
+      const dataService = new DataServiceImpl({
         connectionString: 'mongodb://localhost:27020',
       });
       const client = createMongoClientMock(clientConfig);