chore(data-service): remove DataServiceImpl usage outside of package (#4109)

Other packages should rely on the interface, not the implementation.

Author: addaleax

packages/compass-import-export/src/import/import-csv.spec.ts

@@ -16,7 +16,8 @@ import temp from 'temp';
 
 temp.track();
 
-import { DataServiceImpl } from 'mongodb-data-service';
+import type { DataService } from 'mongodb-data-service';
+import { connect } from 'mongodb-data-service';
 
 import { fixtures } from '../../test/fixtures';
 
@@ -32,13 +33,13 @@ chai.use(sinonChai);
 chai.use(chaiAsPromised);
 
 describe('importCSV', function () {
-  let dataService: DataServiceImpl;
+  let dataService: DataService;
   let dropCollection;
   let createCollection;
   let updateCollection: (ns: string, options: any) => Promise<Document>;
 
   beforeEach(async function () {
-    dataService = new DataServiceImpl({
+    dataService = await connect({
       connectionString: 'mongodb://localhost:27018/local',
     });
 
@@ -52,8 +53,6 @@ describe('importCSV', function () {
       dataService.updateCollection.bind(dataService)
     );
 
-    await dataService.connect();
-
     try {
       await dropCollection('db.col');
     } catch (err) {

packages/compass-import-export/src/import/import-json.spec.ts

@@ -15,7 +15,8 @@ import temp from 'temp';
 
 temp.track();
 
-import { DataServiceImpl } from 'mongodb-data-service';
+import type { DataService } from 'mongodb-data-service';
+import { connect } from 'mongodb-data-service';
 
 import { fixtures } from '../../test/fixtures';
 
@@ -29,13 +30,13 @@ chai.use(sinonChai);
 chai.use(chaiAsPromised);
 
 describe('importJSON', function () {
-  let dataService: DataServiceImpl;
+  let dataService: DataService;
   let dropCollection;
   let createCollection;
   let updateCollection: (ns: string, options: any) => Promise<Document>;
 
   beforeEach(async function () {
-    dataService = new DataServiceImpl({
+    dataService = await connect({
       connectionString: 'mongodb://localhost:27018/local',
     });
 
@@ -49,8 +50,6 @@ describe('importJSON', function () {
       dataService.updateCollection.bind(dataService)
     );
 
-    await dataService.connect();
-
     try {
       await dropCollection('db.col');
     } catch (err) {

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 { DataServiceImpl } from 'mongodb-data-service';
+import { connect } from 'mongodb-data-service';
 import { promisify } from 'util';
 import { once } from 'events';
 import { dataServiceConnected, globalAppRegistryActivated } from './compass';
@@ -21,27 +21,29 @@ describe('export [module]', function () {
   describe('#reducer', function () {
     context('#startExport', function () {
       const globalAppRegistry = new AppRegistry();
-      const dataService = new DataServiceImpl({
-        connectionString: 'mongodb://localhost:27018/local',
-      });
-      const createCollection = promisify(dataService.createCollection).bind(
-        dataService
-      );
-      const dropCollection = promisify(dataService.dropCollection).bind(
-        dataService
-      );
-      const insertMany = promisify(dataService.insertMany).bind(dataService);
+      let dataService;
       const TEST_COLLECTION_NAME = 'local.foobar';
 
       afterEach(async function () {
+        const dropCollection = promisify(dataService.dropCollection).bind(
+          dataService
+        );
+
         await dropCollection(TEST_COLLECTION_NAME);
         await dataService.disconnect().catch((e) => {
           console.error('Failed to disconnet:', e);
         });
       });
 
       beforeEach(async function () {
-        await dataService.connect();
+        dataService = await connect({
+          connectionString: 'mongodb://localhost:27018/local',
+        });
+
+        const createCollection = promisify(dataService.createCollection).bind(
+          dataService
+        );
+        const insertMany = promisify(dataService.insertMany).bind(dataService);
 
         await createCollection(TEST_COLLECTION_NAME, {});
         await insertMany(

packages/data-service/src/index.ts

@@ -3,7 +3,7 @@ import { ConnectionInfo, ConnectionFavoriteOptions } from './connection-info';
 import { ConnectionOptions } from './connection-options';
 import { ConnectionStorage } from './connection-storage';
 import { getConnectionTitle } from './connection-title';
-import { DataService, DataServiceImpl } from './data-service';
+import { DataService } from './data-service';
 import {
   convertConnectionModelToInfo,
   convertConnectionInfoToModel,
@@ -27,7 +27,6 @@ export {
   ConnectionOptions,
   ConnectionStorage,
   DataService,
-  DataServiceImpl,
   connect,
   configuredKMSProviders,
   getConnectionTitle,