fix(tests): readjust type of readReplLogFile

Author: gagik

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

@@ -243,11 +243,11 @@ describe('e2e TLS', function () {
         const logPath = path.join(logBasePath, `${shell.logId}_log`);
         const logContents = await readReplLogFile(logPath);
         expect(
-          logContents.find((line) => line.id.__value === 1_000_000_049)?.attr
+          logContents.find((line) => line.id === 1_000_000_049)?.attr
             .asyncFallbackError
         ).to.equal(null); // Ensure that system CA loading happened asynchronously.
         expect(
-          logContents.find((line) => line.id.__value === 1_000_000_049)?.attr
+          logContents.find((line) => line.id === 1_000_000_049)?.attr
             .systemCertsError
         ).to.equal(null); // Ensure that system CA could be loaded successfully.
       });
@@ -280,11 +280,11 @@ describe('e2e TLS', function () {
         const logPath = path.join(logBasePath, `${shell.logId}_log`);
         const logContents = await readReplLogFile(logPath);
         expect(
-          logContents.find((line) => line.id.__value === 1_000_000_049)?.attr
+          logContents.find((line) => line.id === 1_000_000_049)?.attr
             .asyncFallbackError
         ).to.equal(null); // Ensure that system CA loading happened asynchronously.
         expect(
-          logContents.find((line) => line.id.__value === 1_000_000_049)?.attr
+          logContents.find((line) => line.id === 1_000_000_049)?.attr
             .systemCertsError
         ).to.equal(null); // Ensure that system CA could be loaded successfully.
       });
@@ -309,8 +309,7 @@ describe('e2e TLS', function () {
 
         const logPath = path.join(logBasePath, `${shell.logId}_log`);
         const logContents = await readReplLogFile(logPath);
-        expect(logContents.find((line) => line.id.__value === 1_000_000_049)).to
-          .exist;
+        expect(logContents.find((line) => line.id === 1_000_000_049)).to.exist;
       });
     }
   );

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

@@ -14,6 +14,7 @@ import { promises as fs, createReadStream } from 'fs';
 import { promisify } from 'util';
 import path from 'path';
 import os from 'os';
+import type { MongoLogEntryFromFile } from './repl-helpers';
 import { readReplLogFile, setTemporaryHomeDirectory } from './repl-helpers';
 import { bson } from '@mongosh/service-provider-core';
 import type { Server as HTTPServer } from 'http';
@@ -22,7 +23,6 @@ import { once } from 'events';
 import type { AddressInfo } from 'net';
 const { EJSON } = bson;
 import { sleep } from './util-helpers';
-import type { MongoLogEntry } from 'mongodb-log-writer';
 
 const jsContextFlagCombinations: `--jsContext=${'plain-vm' | 'repl'}`[][] = [
   [],
@@ -1356,7 +1356,7 @@ describe('e2e', function () {
     let logBasePath: string;
     let historyPath: string;
     let readConfig: () => Promise<any>;
-    let readLogFile: <T extends MongoLogEntry>() => Promise<T[]>;
+    let readLogFile: <T extends MongoLogEntryFromFile>() => Promise<T[]>;
     let startTestShell: (...extraArgs: string[]) => Promise<TestShell>;
 
     beforeEach(function () {
@@ -1393,7 +1393,7 @@ describe('e2e', function () {
       }
       readConfig = async () =>
         EJSON.parse(await fs.readFile(configPath, 'utf8'));
-      readLogFile = async <T extends MongoLogEntry>(): Promise<T[]> => {
+      readLogFile = async <T extends MongoLogEntryFromFile>(): Promise<T[]> => {
         if (!shell.logId) {
           throw new Error('Shell does not have a logId associated with it');
         }
@@ -1667,7 +1667,7 @@ describe('e2e', function () {
           expect(shell.assertNoErrors());
           await eventually(async () => {
             const log = await readLogFile<
-              MongoLogEntry & {
+              MongoLogEntryFromFile & {
                 c: string;
                 ctx: string;
               }

packages/e2e-tests/test/repl-helpers.ts

@@ -7,7 +7,6 @@ import sinonChai from 'sinon-chai';
 import chaiAsPromised from 'chai-as-promised';
 import type { MongodSetup } from '../../../testing/integration-testing-hooks';
 import type { MongoLogEntry } from 'mongodb-log-writer';
-import { EJSON } from 'bson';
 
 chai.use(sinonChai);
 chai.use(chaiAsPromised);
@@ -49,13 +48,20 @@ function useTmpdir(): { readonly path: string } {
   };
 }
 
-async function readReplLogFile<T extends MongoLogEntry>(
+type MongoLogEntryFromFile = {
+  t?: {
+    $date: string;
+  };
+  id: number;
+} & Omit<MongoLogEntry, 'id' | 't'>;
+
+async function readReplLogFile<T extends MongoLogEntryFromFile>(
   logPath: string
 ): Promise<T[]> {
   return (await fs.readFile(logPath, 'utf8'))
     .split('\n')
     .filter((line) => line.trim())
-    .map((line) => EJSON.parse(line));
+    .map((line) => JSON.parse(line));
 }
 
 const fakeExternalEditor = async ({
@@ -170,4 +176,5 @@ export {
   setTemporaryHomeDirectory,
   getCertPath,
   connectionStringWithLocalhost,
+  MongoLogEntryFromFile,
 };