MONGOSH-237 - Make print() and console.log() available (#184)

Author: addaleax

package-lock.json

@@ -821,9 +821,9 @@
     "@fortawesome/free-solid-svg-icons": "^5.13.0",
     "@fortawesome/react-fontawesome": "^0.1.9",
     "@leafygreen-ui/toggle": "3.0.1",
-    "@mongosh/browser-runtime-electron": "^0.4.2",
-    "@mongosh/service-provider-server": "^0.4.2",
-    "@mongosh/shell-api": "^0.4.2",
+    "@mongosh/browser-runtime-electron": "^0.5.0",
+    "@mongosh/service-provider-server": "^0.5.0",
+    "@mongosh/shell-api": "^0.5.0",
     "analytics-node": "^3.4.0-beta.1",
     "bson": "^4.0.3",
     "classnames": "^2.2.6",

package.json

@@ -11,6 +11,7 @@ import playgroundTemplate from '../templates/playgroundTemplate';
 import playgroundSearchTemplate from '../templates/playgroundSearchTemplate';
 import playgroundCreateIndexTemplate from '../templates/playgroundCreateIndexTemplate';
 import { createLogger } from '../logging';
+import type { ExecuteAllResult } from '../utils/types';
 
 const log = createLogger('playground controller');
 
@@ -210,9 +211,9 @@ export default class PlaygroundController {
     });
   }
 
-  public async evaluate(codeToEvaluate: string): Promise<any> {
+  public async evaluate(codeToEvaluate: string): Promise<ExecuteAllResult> {
     // Send a request to the language server to execute scripts from a playground.
-    const result = await this._languageServerController.executeAll(
+    const result: ExecuteAllResult = await this._languageServerController.executeAll(
       codeToEvaluate
     );
 
@@ -223,7 +224,7 @@ export default class PlaygroundController {
       result ? false : true
     );
 
-    return Promise.resolve(result);
+    return result;
   }
 
   private getAllText(): string {
@@ -234,7 +235,7 @@ export default class PlaygroundController {
     return this._activeTextEditor?.document.getText(selection) || '';
   }
 
-  public evaluateWithCancelModal(): Promise<any> {
+  public evaluateWithCancelModal(): Promise<ExecuteAllResult> {
     if (!this._connectionString) {
       return Promise.reject(
         new Error('Please connect to a database before running a playground.')
@@ -256,19 +257,19 @@ export default class PlaygroundController {
               this._outputChannel.clear();
               this._outputChannel.show(true);
 
-              return resolve(null);
+              return resolve(undefined);
             });
 
             // Run all playground scripts.
-            const result = await this.evaluate(this._codeToEvaluate);
+            const result: ExecuteAllResult = await this.evaluate(this._codeToEvaluate);
 
             return resolve(result);
           }
         )
         .then(undefined, (error) => {
           log.error('Evaluate playground with cancel modal error', error);
 
-          return resolve(null);
+          return resolve(undefined);
         });
     });
   }
@@ -300,7 +301,7 @@ export default class PlaygroundController {
         }
       }
 
-      const result = await this.evaluateWithCancelModal();
+      const result: ExecuteAllResult = await this.evaluateWithCancelModal();
 
       if (!result) {
         this._outputChannel.clear();
@@ -310,7 +311,8 @@ export default class PlaygroundController {
       }
 
       this._outputChannel.clear();
-      this._outputChannel.append(result);
+      for (const line of result)
+        this._outputChannel.appendLine(line.content);
       this._outputChannel.show(true);
 
       return resolve(true);

src/editors/playgroundController.ts

@@ -9,6 +9,7 @@ import {
   CancellationTokenSource
 } from 'vscode-languageclient';
 import WebSocket from 'ws';
+import type { ExecuteAllResult } from '../utils/types';
 
 import { createLogger } from '../logging';
 import { ServerCommands, PlaygroundRunParameters } from './serverCommands';
@@ -133,7 +134,7 @@ export default class LanguageServerController {
     this.client.stop();
   }
 
-  public executeAll(codeToEvaluate: string): Promise<any> {
+  public executeAll(codeToEvaluate: string): Promise<ExecuteAllResult> {
     return this.client.onReady().then(() => {
       // Instantiate a new CancellationTokenSource object
       // that generates a cancellation token for each run of a playground

src/language/languageServerController.ts

@@ -1,10 +1,9 @@
 import { CompletionItemKind, CancellationToken } from 'vscode-languageserver';
 import { Worker as WorkerThreads } from 'worker_threads';
-import { ElectronRuntime } from '@mongosh/browser-runtime-electron';
-import { CliServiceProvider } from '@mongosh/service-provider-server';
 import { signatures } from '@mongosh/shell-api';
 import * as util from 'util';
 import { Visitor } from './visitor';
+import { ExecuteAllResult } from '../utils/types';
 
 import { ServerCommands, PlaygroundRunParameters } from './serverCommands';
 
@@ -14,8 +13,6 @@ const fs = require('fs');
 export const languageServerWorkerFileName = 'languageServerWorker.js';
 
 export default class MongoDBService {
-  _serviceProvider?: CliServiceProvider;
-  _runtime?: ElectronRuntime;
   _connection: any;
   _connectionString?: string;
   _connectionOptions?: any;
@@ -116,11 +113,6 @@ export default class MongoDBService {
     }
 
     try {
-      this._serviceProvider = await CliServiceProvider.connect(
-        this._connectionString,
-        this._connectionOptions
-      );
-      this._runtime = new ElectronRuntime(this._serviceProvider);
       this.getDatabasesCompletionItems();
 
       return Promise.resolve(true);
@@ -551,8 +543,6 @@ export default class MongoDBService {
   }
 
   public clearCurrentSessionConnection(): void {
-    this._serviceProvider = undefined;
-    this._runtime = undefined;
     this._connectionString = undefined;
     this._connectionOptions = undefined;
   }