feat(package): restructure package internals

e2e/helpers.ts

@@ -1,15 +1,15 @@
-import { promises as fs } from 'fs';
+import { promises as fsPromises } from 'fs';
 
 import { mutationTestReportSchema } from '@stryker-mutator/api/report';
 import { expect } from 'chai';
 import path from 'path';
 import { calculateMetrics, MetricsResult, Metrics } from 'mutation-testing-metrics';
 
 export async function readMutationTestResult(eventResultDirectory = path.resolve('reports', 'mutation', 'events')) {
-  const allReportFiles = await fs.readdir(eventResultDirectory);
+  const allReportFiles = await fsPromises.readdir(eventResultDirectory);
   const mutationTestReportFile = allReportFiles.find(file => !!file.match(/.*onMutationTestReportReady.*/));
   expect(mutationTestReportFile).ok;
-  const mutationTestReportContent = await fs.readFile(path.resolve(eventResultDirectory, mutationTestReportFile || ''), 'utf8');
+  const mutationTestReportContent = await fsPromises.readFile(path.resolve(eventResultDirectory, mutationTestReportFile || ''), 'utf8');
   const report = JSON.parse(mutationTestReportContent) as mutationTestReportSchema.MutationTestResult;
   const metricsResult = calculateMetrics(report.files);
   return metricsResult;
@@ -20,7 +20,7 @@ type WritableMetricsResult = {
 };
 
 export function readLogFile(fileName = path.resolve('stryker.log')): Promise<string> {
-  return fs.readFile(fileName, 'utf8');
+  return fsPromises.readFile(fileName, 'utf8');
 }
 
 export async function expectMetricsResult(expectedMetricsResult: Partial<MetricsResult>) {

e2e/test/command/verify/verify.ts

@@ -1,4 +1,4 @@
-import { promises as fs } from 'fs';
+import { promises as fsPromises } from 'fs';
 
 import { expect } from 'chai';
 import { expectMetricsResult, produceMetrics } from '../../../helpers';
@@ -21,7 +21,7 @@ describe('After running stryker with the command test runner', () => {
   });
 
   it('should write to a log file', async () => {
-    const strykerLog = await fs.readFile('./stryker.log', 'utf8');
+    const strykerLog = await fsPromises.readFile('./stryker.log', 'utf8');
     expect(strykerLog).contains('INFO DryRunExecutor Initial test run succeeded. Ran 1 test');
     expect(strykerLog).matches(/MutationTestExecutor Done in \d+/);
     expect(strykerLog).not.contains('ERROR');

e2e/test/exit-prematurely-dry-run-fails/verify/verify.ts

@@ -1,6 +1,5 @@
-import { promises as fs } from 'fs';
+import { promises as fsPromises } from 'fs';
 import chai, { expect } from 'chai';
-import { it } from 'mocha';
 import chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised);
 
@@ -9,7 +8,7 @@ describe('Verify stryker has handled dry run failure correctly', () => {
   let strykerLog: string;
 
   before(async () => {
-    strykerLog = await fs.readFile('./stryker.log', 'utf8');
+    strykerLog = await fsPromises.readFile('./stryker.log', 'utf8');
   });
 
   it('should about failed tests in initial test run', async () => {
@@ -30,6 +29,6 @@ describe('Verify stryker has handled dry run failure correctly', () => {
 
 
   it('should not delete the temp dir', async () => {
-    await expect(fs.stat('.stryker-tmp'), 'Expected the `.stryker-tmp` dir to not be deleted.').not.rejected;
+    await expect(fsPromises.stat('.stryker-tmp'), 'Expected the `.stryker-tmp` dir to not be deleted.').not.rejected;
   });
 });

e2e/test/jasmine-javascript/verify/verify.ts

@@ -1,4 +1,4 @@
-import { promises as fs } from 'fs';
+import { promises as fsPromises } from 'fs';
 
 import { expect } from 'chai';
 import { expectMetrics } from '../../../helpers';
@@ -20,7 +20,7 @@ describe('After running stryker with test runner jasmine, test framework jasmine
   });
 
   it('should write to a log file', async () => {
-    const strykerLog = await fs.readFile('./stryker.log', 'utf8');
+    const strykerLog = await fsPromises.readFile('./stryker.log', 'utf8');
     expect(strykerLog).matches(/INFO InputFileResolver Found 2 of 9 file\(s\) to be mutated/);
     expect(strykerLog).matches(/Done in \d+ second/);
     // TODO, we now have an error because of a memory leak: https://github.com/jasmine/jasmine-npm/issues/134

e2e/test/mocha-old-version/verify/verify.ts

@@ -1,13 +1,12 @@
-import { promises as fs } from 'fs';
+import { promises as fsPromises } from 'fs';
 import { expect } from 'chai';
-import { it } from 'mocha';
 
 describe('Verify stryker runs with mocha < 6', () => {
 
   let strykerLog: string;
 
   before(async () => {
-    strykerLog = await fs.readFile('./stryker.log', 'utf8');
+    strykerLog = await fsPromises.readFile('./stryker.log', 'utf8');
   });
 
   it('should warn about old mocha version', async () => {

e2e/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../tsconfig.settings.json",
   "compilerOptions": {
     "declaration": false,
+    "composite": false,
     "importHelpers": false,
     "esModuleInterop": true,
     "rootDir": ".",

packages/core/src/reporters/event-recorder-reporter.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { promises as fs } from 'fs';
+import { promises as fsPromises } from 'fs';
 
 import { StrykerOptions } from '@stryker-mutator/api/core';
 import { Logger } from '@stryker-mutator/api/logging';
@@ -24,7 +24,7 @@ export class EventRecorderReporter implements StrictReporter {
   private writeToFile(methodName: keyof Reporter, data: any) {
     const filename = path.join(this.options.eventReporter.baseDir, `${this.format(this.index++)}-${methodName}.json`);
     this.log.debug(`Writing event ${methodName} to file ${filename}`);
-    return fs.writeFile(filename, JSON.stringify(data), { encoding: 'utf8' });
+    return fsPromises.writeFile(filename, JSON.stringify(data), { encoding: 'utf8' });
   }
 
   private format(input: number) {

packages/instrumenter/test/integration/disable-type-checks.it.spec.ts

@@ -1,4 +1,4 @@
-import { promises as fs } from 'fs';
+import { promises as fsPromises } from 'fs';
 
 import { expect } from 'chai';
 import chaiJestSnapshot from 'chai-jest-snapshot';
@@ -22,7 +22,7 @@ describe(`${disableTypeChecks.name} integration`, () => {
 
   async function arrangeAndActAssert(fileName: string, options = createInstrumenterOptions()) {
     const fullFileName = resolveTestResource('disable-type-checks', fileName);
-    const file = new File(fullFileName, await fs.readFile(fullFileName));
+    const file = new File(fullFileName, await fsPromises.readFile(fullFileName));
     const result = await disableTypeChecks(file, options);
     chaiJestSnapshot.setFilename(resolveTestResource(`${fileName}.out.snap`));
     expect(result.textContent).matchSnapshot();

packages/instrumenter/test/integration/parsers.it.spec.ts

@@ -1,4 +1,4 @@
-import { promises as fs } from 'fs';
+import { promises as fsPromises } from 'fs';
 
 import { expect } from 'chai';
 
@@ -73,7 +73,7 @@ describe('parsers integration', () => {
 
   async function act(testResourceFileName: string, options: ParserOptions) {
     const fileName = resolveParserTestResource(testResourceFileName);
-    const input = await fs.readFile(fileName, 'utf8');
+    const input = await fsPromises.readFile(fileName, 'utf8');
     const actual = await createParser(options)(input, fileName);
     cleanFileName(actual, testResourceFileName);
     return actual;

packages/instrumenter/test/integration/printers.it.spec.ts

@@ -1,4 +1,4 @@
-import { promises as fs } from 'fs';
+import { promises as fsPromises } from 'fs';
 
 import { normalizeWhitespaces } from '@stryker-mutator/util';
 import { expect } from 'chai';
@@ -18,7 +18,7 @@ describe('parse and print integration', () => {
 
     async function actArrangeAndAssert(relativeFileName: string) {
       const fileName = resolvePrinterTestResource('echo', relativeFileName);
-      const code = await fs.readFile(fileName, 'utf8');
+      const code = await fsPromises.readFile(fileName, 'utf8');
       const parsed = await createParser(createParserOptions())(code, fileName);
       const output = print(parsed);
       expect(normalizeWhitespaces(output)).eq(normalizeWhitespaces(code));
@@ -32,7 +32,7 @@ describe('parse and print integration', () => {
     async function actArrangeAndAssert(testCase: string) {
       const inputFileName = resolvePrinterTestResource('html', `${testCase}.in.html`);
       const outputFileName = resolvePrinterTestResource('html', `${testCase}.out.html`);
-      const [input, expectedOutput] = await Promise.all([fs.readFile(inputFileName, 'utf8'), fs.readFile(outputFileName, 'utf8')]);
+      const [input, expectedOutput] = await Promise.all([fsPromises.readFile(inputFileName, 'utf8'), fsPromises.readFile(outputFileName, 'utf8')]);
       const parsed = await createParser(createParserOptions())(input, inputFileName);
       const actualOutput = print(parsed);
       expect(normalizeWhitespaces(actualOutput)).eq(normalizeWhitespaces(expectedOutput));