feat: bump mongosh APIs to latest VSCODE-240

Also includes the change from
#219
and bumps mongodb-connection-model to a version that depends on the
3.x driver directly instead of using it as a peer dependency,
and minor drive-by things I’ve noticed (use `mongodb` itself only
for typed imports, use `assert.strictEqual` where it gives a better
error message, adjust types in preparation for a 4.0 driver update).

Author: addaleax

package-lock.json

@@ -867,10 +867,10 @@
     "@iconify-icons/codicon": "^1.1.5",
     "@iconify/react": "^1.1.3",
     "@leafygreen-ui/toggle": "3.0.1",
-    "@mongosh/browser-runtime-electron": "^0.6.1",
-    "@mongosh/i18n": "^0.8.0",
-    "@mongosh/service-provider-server": "^0.6.1",
-    "@mongosh/shell-api": "^0.6.1",
+    "@mongosh/browser-runtime-electron": "^0.15.0",
+    "@mongosh/i18n": "^0.15.0",
+    "@mongosh/service-provider-server": "^0.15.0",
+    "@mongosh/shell-api": "^0.15.0",
     "analytics-node": "^3.5.0",
     "bson": "^4.2.0",
     "classnames": "^2.2.6",
@@ -879,7 +879,7 @@
     "micromatch": "^4.0.2",
     "mongodb": "^3.6.3",
     "mongodb-cloud-info": "^1.1.2",
-    "mongodb-connection-model": "^19.0.2",
+    "mongodb-connection-model": "^20.2.0",
     "mongodb-data-service": "^19.0.0",
     "mongodb-ns": "^2.2.0",
     "mongodb-schema": "^8.2.5",

package.json

@@ -4,7 +4,7 @@ import { CompletionItemKind, CancellationToken, Connection, CompletionItem, Mark
 import fs from 'fs';
 import path from 'path';
 import { signatures } from '@mongosh/shell-api';
-import Translator from '@mongosh/i18n/lib/translator';
+import translator from '@mongosh/i18n';
 import { Worker as WorkerThreads } from 'worker_threads';
 
 import { CollectionItem } from '../types/collectionItemType';
@@ -399,7 +399,6 @@ export default class MongoDBService {
   // Get shell API symbols/methods completion from mongosh.
   _getShellCompletionItems(): ShellCompletionItem {
     const shellSymbols = {};
-    const translator = new Translator();
 
     Object.keys(signatures).map((symbol) => {
       shellSymbols[symbol] = Object.keys(

src/language/mongoDBService.ts

@@ -1,6 +1,6 @@
 import {
   CliServiceProvider,
-  NodeOptions
+  MongoClientOptions
 } from '@mongosh/service-provider-server';
 import { CompletionItemKind } from 'vscode-languageserver';
 import { EJSON } from 'bson';
@@ -21,7 +21,7 @@ type WorkerError = any | null;
 const executeAll = async (
   codeToEvaluate: string,
   connectionString: string,
-  connectionOptions: NodeOptions
+  connectionOptions: MongoClientOptions
 ): Promise<[WorkerError, WorkerResult?]> => {
   try {
     // Instantiate a data service provider.

src/language/worker.ts

@@ -1,4 +1,4 @@
-import { Document, MongoClient } from 'mongodb';
+import type { Document, MongoClient } from 'mongodb';
 import { getCloudInfo } from 'mongodb-cloud-info';
 import mongoDBBuildInfo from 'mongodb-build-info';
 

src/telemetry/connectionTelemetry.ts

@@ -3,7 +3,7 @@ import * as vscode from 'vscode';
 import { config } from 'dotenv';
 import fs from 'fs';
 import SegmentAnalytics from 'analytics-node';
-import { MongoClient } from 'mongodb';
+import type { MongoClient } from 'mongodb';
 
 import { ConnectionModel } from '../types/connectionModelType';
 import { ConnectionTypes } from '../connectionController';

src/telemetry/telemetryService.ts

@@ -95,10 +95,7 @@ suite('Commands Test Suite', () => {
 
       const shellCommandText = fakeSendTerminalText.firstCall.args[0];
 
-      assert(
-        shellCommandText === 'mongo $MDB_CONNECTION_STRING;',
-        'Expected sendText to terminal to be equal mongo $MDB_CONNECTION_STRING;'
-      );
+      assert.strictEqual(shellCommandText, 'mongo $MDB_CONNECTION_STRING;');
     });
 
     test('openMongoDBShell should open a terminal with ssh tunnel port injected', async () => {
@@ -126,10 +123,7 @@ suite('Commands Test Suite', () => {
 
       const shellCommandText = fakeSendTerminalText.firstCall.args[0];
 
-      assert(
-        shellCommandText === 'mongo $MDB_CONNECTION_STRING;',
-        'Expected sendText to terminal to be equal mongo $MDB_CONNECTION_STRING;'
-      );
+      assert.strictEqual(shellCommandText, 'mongo $MDB_CONNECTION_STRING;');
     });
 
     test('openMongoDBShell should open a terminal with ssl config injected', async () => {
@@ -160,10 +154,7 @@ suite('Commands Test Suite', () => {
 
       const shellCommandText = fakeSendTerminalText.firstCall.args[0];
 
-      assert(
-        shellCommandText === 'mongo --tls --tlsAllowInvalidHostnames --tlsCAFile="./path_to_some_file" $MDB_CONNECTION_STRING;',
-        'Expected sendText to terminal to iclude tls options and ssl connection string'
-      );
+      assert.strictEqual(shellCommandText, 'mongo --tls --tlsAllowInvalidHostnames --tlsCAFile="./path_to_some_file" $MDB_CONNECTION_STRING;');
     });
 
     test('openMongoDBShell should open a terminal with x509 config injected', async () => {
@@ -189,17 +180,11 @@ suite('Commands Test Suite', () => {
       const terminalOptions: vscode.TerminalOptions =
         createTerminalStub.firstCall.args[0];
 
-      assert(
-        terminalOptions.env?.MDB_CONNECTION_STRING === driverUri,
-        `Expected open terminal to set shell arg as driver url "${driverUri}" found "${terminalOptions.env?.MDB_CONNECTION_STRING}"`
-      );
+      assert.strictEqual(terminalOptions.env?.MDB_CONNECTION_STRING, driverUri);
 
       const shellCommandText = fakeSendTerminalText.firstCall.args[0];
 
-      assert(
-        shellCommandText === 'mongo --tls --tlsAllowInvalidHostnames --tlsCAFile="./path_to_ca" --tlsCertificateKeyFile="./path_to_cert" $MDB_CONNECTION_STRING;',
-        'Expected sendText to terminal to iclude tls options and x509 connection string'
-      );
+      assert.strictEqual(shellCommandText, 'mongo --tls --tlsAllowInvalidHostnames --tlsCAFile="./path_to_ca" --tlsCertificateKeyFile="./path_to_cert" $MDB_CONNECTION_STRING;');
     });
   });
 
@@ -235,7 +220,7 @@ suite('Commands Test Suite', () => {
       const shellCommandText = fakeSendTerminalText.firstCall.args[0];
       assert(
         shellCommandText.includes('$Env:MDB_CONNECTION_STRING'),
-        'Expected sendText to terminal to use powershell env variable syntax'
+        `Expected sendText to terminal (${shellCommandText}) to use powershell env variable syntax`
       );
     });
 

src/test/suite/commands/launchMongoShell.test.ts

@@ -12,7 +12,7 @@ import { ConnectionTypes } from '../../../connectionController';
 
 suite('ConnectionTelemetry Controller Test Suite', () => {
   suite('with mock client', () => {
-    const mockClient = {
+    const mockClient: any = {
       db: () => ({
         command: () => ({})
       })

src/test/suite/telemetry/connectionTelemetry.test.ts

@@ -7,7 +7,6 @@ export type ConnectionOptions = {
     password: string;
   };
   useUnifiedTopology?: boolean;
-  connectWithNoPrimary?: boolean;
   useNewUrlParser?: boolean;
   port?: number;
   authSource?: string;