refactor: finalise pr

Author: alenakhineika

packages/e2e-tests/test/e2e.spec.ts

@@ -1513,10 +1513,6 @@ describe('e2e', function () {
         });
 
         it('writes custom log directly', async function () {
-          const connectionString = await testServer.connectionString();
-          await shell.executeLine(
-            `connect(${JSON.stringify(connectionString)})`
-          );
           await shell.executeLine("log.info('This is a custom entry')");
           await eventually(async () => {
             const log = await readLogfile();
@@ -1537,14 +1533,19 @@ describe('e2e', function () {
             __dirname,
             '..',
             '..',
-            'cli-repl',
+            'e2e-tests',
             'test',
             'fixtures',
             'custom-log-info.js'
           );
-          await shell.executeLine(`load('${filename}')`);
+          await shell.executeLine(`load(${JSON.stringify(filename)})`);
           await eventually(async () => {
             const log = await readLogfile();
+            expect(
+              log.filter((logEntry) =>
+                logEntry.msg.includes('Initiating connection attemp')
+              )
+            ).to.have.lengthOf(1);
             expect(
               log.filter((logEntry) => logEntry.msg.includes('Hi there'))
             ).to.have.lengthOf(1);
@@ -1975,7 +1976,7 @@ describe('e2e', function () {
         __dirname,
         '..',
         '..',
-        'cli-repl',
+        'e2e-tests',
         'test',
         'fixtures',
         'simple-console-log.js'

packages/cli-repl/test/fixtures/custom-log-info.js renamed to packages/e2e-tests/test/fixtures/custom-log-info.js

@@ -35,6 +35,7 @@ import NoDatabase from './no-db';
 import type { ShellBson } from './shell-bson';
 import constructShellBson from './shell-bson';
 import { Streams } from './streams';
+import constructShellLog, { type ShellLog } from './shell-log';
 
 /**
  * The subset of CLI options that is relevant for the shell API's behavior itself.
@@ -159,6 +160,7 @@ export default class ShellInstanceState {
   public context: any;
   public mongos: Mongo[];
   public shellApi: ShellApi;
+  public shellLog: ShellLog;
   public shellBson: ShellBson;
   public cliOptions: ShellCliOptions;
   public evaluationListener: EvaluationListener;
@@ -187,6 +189,7 @@ export default class ShellInstanceState {
     this.initialServiceProvider = initialServiceProvider;
     this.messageBus = messageBus;
     this.shellApi = new ShellApi(this);
+    this.shellLog = constructShellLog(this.messageBus);
     this.shellBson = constructShellBson(
       initialServiceProvider.bsonLibrary,
       (msg: string) => {
@@ -362,48 +365,8 @@ export default class ShellInstanceState {
       });
     }
 
-    const bus = this.messageBus;
-    if (contextObject.log === undefined) {
-      contextObject.log = {
-        info(message: string, attr?: unknown) {
-          bus.emit('mongosh:write-custom-log', {
-            method: 'info',
-            message,
-            attr,
-          });
-        },
-        warn(message: string, attr?: unknown) {
-          bus.emit('mongosh:write-custom-log', {
-            method: 'warn',
-            message,
-            attr,
-          });
-        },
-        error(message: string, attr?: unknown) {
-          bus.emit('mongosh:write-custom-log', {
-            method: 'error',
-            message,
-            attr,
-          });
-        },
-        fatal(message: string, attr?: unknown) {
-          bus.emit('mongosh:write-custom-log', {
-            method: 'fatal',
-            message,
-            attr,
-          });
-        },
-        debug(message: string, attr?: unknown, level?: 1 | 2 | 3 | 4 | 5) {
-          bus.emit('mongosh:write-custom-log', {
-            method: 'debug',
-            message,
-            attr,
-            level,
-          });
-        },
-      };
-    }
-    bus.emit('mongosh:setCtx', { method: 'setCtx', arguments: {} });
+    Object.assign(contextObject, this.shellLog);
+    this.messageBus.emit('mongosh:setCtx', { method: 'setCtx', arguments: {} });
   }
 
   get currentServiceProvider(): ServiceProvider {

packages/cli-repl/test/fixtures/simple-console-log.js renamed to packages/e2e-tests/test/fixtures/simple-console-log.js

@@ -0,0 +1,54 @@
+import type { MongoshBus } from '@mongosh/types';
+
+export interface ShellLog {
+  log: {
+    info: (message: string, attr?: unknown) => void;
+    warn: (message: string, attr?: unknown) => void;
+    error: (message: string, attr?: unknown) => void;
+    fatal: (message: string, attr?: unknown) => void;
+    debug: (message: string, attr?: unknown, level?: 1 | 2 | 3 | 4 | 5) => void;
+  };
+}
+
+export default function constructShellLog(messageBus: MongoshBus): ShellLog {
+  return {
+    log: {
+      info(message: string, attr?: unknown) {
+        messageBus.emit('mongosh:write-custom-log', {
+          method: 'info',
+          message,
+          attr,
+        });
+      },
+      warn(message: string, attr?: unknown) {
+        messageBus.emit('mongosh:write-custom-log', {
+          method: 'warn',
+          message,
+          attr,
+        });
+      },
+      error(message: string, attr?: unknown) {
+        messageBus.emit('mongosh:write-custom-log', {
+          method: 'error',
+          message,
+          attr,
+        });
+      },
+      fatal(message: string, attr?: unknown) {
+        messageBus.emit('mongosh:write-custom-log', {
+          method: 'fatal',
+          message,
+          attr,
+        });
+      },
+      debug(message: string, attr?: unknown, level?: 1 | 2 | 3 | 4 | 5) {
+        messageBus.emit('mongosh:write-custom-log', {
+          method: 'debug',
+          message,
+          attr,
+          level,
+        });
+      },
+    },
+  };
+}