diff --git a/.eslintrc.js b/.eslintrc.js index e5041bfb69..aaf6f042eb 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,4 +1,3 @@ - module.exports = { env: { node: true @@ -9,8 +8,10 @@ module.exports = { }, parser: '@typescript-eslint/parser', extends: ['prettier', 'eslint:recommended'], - plugins: ['@typescript-eslint', 'prettier'], + plugins: ['@typescript-eslint', 'prettier', 'import'], rules: { + 'import/newline-after-import': 1, + 'import/order': ["error", {"newlines-between": "always"}], 'prettier/prettier': ['error'], 'sort-imports': 'off', // No auto-fix! 'no-case-declarations': 'off', diff --git a/package.json b/package.json index 50417532a7..53a3e17012 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "eslint": "~6.6.0", "eslint-config-prettier": "~6.5.0", "eslint-plugin-import": "~2.18.2", - "eslint-plugin-prettier": "~3.1.0", + "eslint-plugin-prettier": "~3.1.1", "execa": "^3.2.0", "glob": "^7.1.1", "if-node-version": "^1.1.1", diff --git a/packages/api/report.ts b/packages/api/report.ts index 21b74e3a71..dd34e51494 100644 --- a/packages/api/report.ts +++ b/packages/api/report.ts @@ -1,4 +1,5 @@ import * as mutationTestReportSchema from 'mutation-testing-report-schema/dist/src/api'; + export { default as Reporter } from './src/report/Reporter'; export { default as MutantResult } from './src/report/MutantResult'; export { default as MutantStatus } from './src/report/MutantStatus'; diff --git a/packages/api/src/mutant/Mutator.ts b/packages/api/src/mutant/Mutator.ts index bea939660b..21e6050162 100644 --- a/packages/api/src/mutant/Mutator.ts +++ b/packages/api/src/mutant/Mutator.ts @@ -1,4 +1,5 @@ import { File } from '../../core'; + import Mutant from './Mutant'; export default interface Mutator { diff --git a/packages/api/src/plugin/Contexts.ts b/packages/api/src/plugin/Contexts.ts index 34222ebe9f..1e91a1156d 100644 --- a/packages/api/src/plugin/Contexts.ts +++ b/packages/api/src/plugin/Contexts.ts @@ -1,5 +1,6 @@ import { MutatorDescriptor, StrykerOptions } from '../../core'; import { Logger, LoggerFactoryMethod } from '../../logging'; + import { PluginKind } from './PluginKind'; import { PluginResolver } from './Plugins'; import { commonTokens } from './tokens'; diff --git a/packages/api/src/plugin/Plugins.ts b/packages/api/src/plugin/Plugins.ts index 58277293ba..4ac6b94669 100644 --- a/packages/api/src/plugin/Plugins.ts +++ b/packages/api/src/plugin/Plugins.ts @@ -1,10 +1,12 @@ import { InjectableClass, InjectableFunction, InjectionToken } from 'typed-inject'; + import { ConfigEditor } from '../../config'; import { Mutator } from '../../mutant'; import { Reporter } from '../../report'; import { TestFramework } from '../../test_framework'; import { TestRunner } from '../../test_runner'; import { Transpiler } from '../../transpile'; + import { PluginContexts } from './Contexts'; import { PluginKind } from './PluginKind'; diff --git a/packages/api/src/report/MutantResult.ts b/packages/api/src/report/MutantResult.ts index 8cc1b50773..bf18035639 100644 --- a/packages/api/src/report/MutantResult.ts +++ b/packages/api/src/report/MutantResult.ts @@ -1,4 +1,5 @@ import { Location, Range } from '../../core'; + import MutantStatus from './MutantStatus'; interface MutantResult { diff --git a/packages/api/src/report/Reporter.ts b/packages/api/src/report/Reporter.ts index ab6e3a8c25..eba016e98f 100644 --- a/packages/api/src/report/Reporter.ts +++ b/packages/api/src/report/Reporter.ts @@ -1,4 +1,5 @@ import { MutationTestResult } from 'mutation-testing-report-schema'; + import MatchedMutant from './MatchedMutant'; import MutantResult from './MutantResult'; import ScoreResult from './ScoreResult'; diff --git a/packages/api/test/integration/install-module/install-module.ts b/packages/api/test/integration/install-module/install-module.ts index b03db1c34c..b8c9b5653e 100644 --- a/packages/api/test/integration/install-module/install-module.ts +++ b/packages/api/test/integration/install-module/install-module.ts @@ -1,7 +1,8 @@ -import { expect } from 'chai'; import { exec } from 'child_process'; import * as path from 'path'; +import { expect } from 'chai'; + describe('we have a module using stryker', () => { const modulePath = path.resolve(__dirname, '../../../testResources/module'); diff --git a/packages/api/test/unit/config/Config.spec.ts b/packages/api/test/unit/config/Config.spec.ts index 5541748888..c986aa5c01 100644 --- a/packages/api/test/unit/config/Config.spec.ts +++ b/packages/api/test/unit/config/Config.spec.ts @@ -1,5 +1,6 @@ import { expect } from 'chai'; import * as minimatch from 'minimatch'; + import { Config } from '../../../config'; describe('Config', () => { diff --git a/packages/api/test/unit/core/File.spec.ts b/packages/api/test/unit/core/File.spec.ts index c4c95d6c81..b68e5cbcfe 100644 --- a/packages/api/test/unit/core/File.spec.ts +++ b/packages/api/test/unit/core/File.spec.ts @@ -1,5 +1,6 @@ import { expect } from 'chai'; import { deserialize, serialize } from 'surrial'; + import { File } from '../../../core'; describe('File', () => { diff --git a/packages/api/test/unit/core/LogLevel.spec.ts b/packages/api/test/unit/core/LogLevel.spec.ts index 7afd9c79c7..43d3c1fe73 100644 --- a/packages/api/test/unit/core/LogLevel.spec.ts +++ b/packages/api/test/unit/core/LogLevel.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import LogLevel from '../../../src/core/LogLevel'; describe('LogLevel', () => { diff --git a/packages/api/test/unit/plugin/tokens.spec.ts b/packages/api/test/unit/plugin/tokens.spec.ts index 70098d7a10..aa13c15a61 100644 --- a/packages/api/test/unit/plugin/tokens.spec.ts +++ b/packages/api/test/unit/plugin/tokens.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import { commonTokens, tokens } from '../../../plugin'; describe('tokens', () => { diff --git a/packages/babel-transpiler/src/BabelConfigReader.ts b/packages/babel-transpiler/src/BabelConfigReader.ts index 8d5eccba02..9cd829ff6e 100644 --- a/packages/babel-transpiler/src/BabelConfigReader.ts +++ b/packages/babel-transpiler/src/BabelConfigReader.ts @@ -1,8 +1,10 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; -import * as fs from 'fs'; -import * as path from 'path'; + import * as babel from './helpers/babelWrapper'; export interface StrykerBabelConfig { diff --git a/packages/babel-transpiler/src/BabelTranspiler.ts b/packages/babel-transpiler/src/BabelTranspiler.ts index a795d1b323..1b7f591e29 100644 --- a/packages/babel-transpiler/src/BabelTranspiler.ts +++ b/packages/babel-transpiler/src/BabelTranspiler.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { commonTokens, Injector, tokens, TranspilerPluginContext } from '@stryker-mutator/api/plugin'; import { Transpiler } from '@stryker-mutator/api/transpile'; import { StrykerError } from '@stryker-mutator/util'; -import * as path from 'path'; + import { BabelConfigReader, StrykerBabelConfig } from './BabelConfigReader'; import * as babel from './helpers/babelWrapper'; import { toJSFileName } from './helpers/helpers'; diff --git a/packages/babel-transpiler/src/index.ts b/packages/babel-transpiler/src/index.ts index faccdf8ea6..24e46edc38 100644 --- a/packages/babel-transpiler/src/index.ts +++ b/packages/babel-transpiler/src/index.ts @@ -1,4 +1,5 @@ import { declareFactoryPlugin, PluginKind } from '@stryker-mutator/api/plugin'; + import { babelTranspilerFactory } from './BabelTranspiler'; export const strykerPlugins = [declareFactoryPlugin(PluginKind.Transpiler, 'babel', babelTranspilerFactory)]; diff --git a/packages/babel-transpiler/test/helpers/projectLoader.ts b/packages/babel-transpiler/test/helpers/projectLoader.ts index 7d484e2f7f..6f9a845e86 100644 --- a/packages/babel-transpiler/test/helpers/projectLoader.ts +++ b/packages/babel-transpiler/test/helpers/projectLoader.ts @@ -1,8 +1,9 @@ -import { File } from '@stryker-mutator/api/core'; import * as fs from 'fs'; -import * as glob from 'glob'; import * as path from 'path'; +import { File } from '@stryker-mutator/api/core'; +import * as glob from 'glob'; + const CARRIAGE_RETURN = '\r'.charCodeAt(0); function readFile(fileName: string) { diff --git a/packages/babel-transpiler/test/integration/BabelProjects.it.spec.ts b/packages/babel-transpiler/test/integration/BabelProjects.it.spec.ts index 2e75c8a477..3e647ae1d1 100644 --- a/packages/babel-transpiler/test/integration/BabelProjects.it.spec.ts +++ b/packages/babel-transpiler/test/integration/BabelProjects.it.spec.ts @@ -1,9 +1,11 @@ +import * as path from 'path'; + import { ConfigAPI } from '@babel/core'; import { File } from '@stryker-mutator/api/core'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as path from 'path'; + import { CONFIG_KEY, StrykerBabelConfig } from '../../src/BabelConfigReader'; import { BabelTranspiler, babelTranspilerFactory } from '../../src/BabelTranspiler'; import { ProjectLoader } from '../helpers/projectLoader'; diff --git a/packages/babel-transpiler/test/unit/BabelConfigReader.spec.ts b/packages/babel-transpiler/test/unit/BabelConfigReader.spec.ts index 899c39ad73..3142df1063 100644 --- a/packages/babel-transpiler/test/unit/BabelConfigReader.spec.ts +++ b/packages/babel-transpiler/test/unit/BabelConfigReader.spec.ts @@ -1,8 +1,10 @@ -import { factory, testInjector } from '@stryker-mutator/test-helpers'; -import { expect } from 'chai'; import * as fs from 'fs'; import * as path from 'path'; + +import { factory, testInjector } from '@stryker-mutator/test-helpers'; +import { expect } from 'chai'; import * as sinon from 'sinon'; + import { BabelConfigReader, StrykerBabelConfig } from '../../src/BabelConfigReader'; describe(BabelConfigReader.name, () => { diff --git a/packages/babel-transpiler/test/unit/BabelTranspiler.spec.ts b/packages/babel-transpiler/test/unit/BabelTranspiler.spec.ts index 2567c56665..359b87bf76 100644 --- a/packages/babel-transpiler/test/unit/BabelTranspiler.spec.ts +++ b/packages/babel-transpiler/test/unit/BabelTranspiler.spec.ts @@ -1,9 +1,11 @@ +import * as path from 'path'; + import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as path from 'path'; import * as sinon from 'sinon'; + import { BabelConfigReader, StrykerBabelConfig } from '../../src/BabelConfigReader'; import { BabelTranspiler } from '../../src/BabelTranspiler'; import * as babel from '../../src/helpers/babelWrapper'; diff --git a/packages/core/src/Sandbox.ts b/packages/core/src/Sandbox.ts index b70152cd29..f3c7b320be 100644 --- a/packages/core/src/Sandbox.ts +++ b/packages/core/src/Sandbox.ts @@ -1,3 +1,5 @@ +import * as path from 'path'; + import { StrykerOptions } from '@stryker-mutator/api/core'; import { File } from '@stryker-mutator/api/core'; import { MutantResult, MutantStatus } from '@stryker-mutator/api/report'; @@ -6,7 +8,7 @@ import { RunResult, RunStatus, TestRunner, TestStatus } from '@stryker-mutator/a import { normalizeWhitespaces } from '@stryker-mutator/util'; import { getLogger } from 'log4js'; import * as mkdirp from 'mkdirp'; -import * as path from 'path'; + import LoggingClientContext from './logging/LoggingClientContext'; import ResilientTestRunnerFactory from './test-runner/ResilientTestRunnerFactory'; import TestableMutant, { TestSelectionResult } from './TestableMutant'; diff --git a/packages/core/src/SandboxPool.ts b/packages/core/src/SandboxPool.ts index 2486bb03f9..c99aa2fc87 100644 --- a/packages/core/src/SandboxPool.ts +++ b/packages/core/src/SandboxPool.ts @@ -1,12 +1,14 @@ +import * as os from 'os'; + import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { MutantResult } from '@stryker-mutator/api/report'; import { TestFramework } from '@stryker-mutator/api/test_framework'; -import * as os from 'os'; import { Observable, range, Subject } from 'rxjs'; import { filter, flatMap, map, merge, tap, zip } from 'rxjs/operators'; import { Disposable } from 'typed-inject'; + import { coreTokens } from './di'; import LoggingClientContext from './logging/LoggingClientContext'; import { InitialTestRunResult } from './process/InitialTestExecutor'; diff --git a/packages/core/src/ScoreResultCalculator.ts b/packages/core/src/ScoreResultCalculator.ts index 055ccf07ca..f19ac45c29 100644 --- a/packages/core/src/ScoreResultCalculator.ts +++ b/packages/core/src/ScoreResultCalculator.ts @@ -1,10 +1,13 @@ +import * as path from 'path'; + import { MutationScoreThresholds } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { MutantResult, MutantStatus, ScoreResult } from '@stryker-mutator/api/report'; + import flatMap = require('lodash.flatmap'); import groupBy = require('lodash.groupby'); -import * as path from 'path'; + import { freezeRecursively, setExitCode } from './utils/objectUtils'; const defaultScoreIfNoValidMutants = 100; diff --git a/packages/core/src/Stryker.ts b/packages/core/src/Stryker.ts index 4df8e437e1..209e1c1cf4 100644 --- a/packages/core/src/Stryker.ts +++ b/packages/core/src/Stryker.ts @@ -3,6 +3,7 @@ import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, PluginKind } from '@stryker-mutator/api/plugin'; import { MutantResult } from '@stryker-mutator/api/report'; import { Injector } from 'typed-inject'; + import { buildMainInjector, coreTokens, MainContext, PluginCreator } from './di'; import InputFileCollection from './input/InputFileCollection'; import InputFileResolver from './input/InputFileResolver'; diff --git a/packages/core/src/StrykerCli.ts b/packages/core/src/StrykerCli.ts index 08580eaeec..1438184c2e 100644 --- a/packages/core/src/StrykerCli.ts +++ b/packages/core/src/StrykerCli.ts @@ -1,5 +1,6 @@ import * as program from 'commander'; import { getLogger } from 'log4js'; + import { CONFIG_SYNTAX_HELP } from './config/ConfigReader'; import { initializerFactory } from './initializer'; import LogConfigurator from './logging/LogConfigurator'; diff --git a/packages/core/src/TestFrameworkOrchestrator.ts b/packages/core/src/TestFrameworkOrchestrator.ts index 66c7c38ae9..e56ebf8be1 100644 --- a/packages/core/src/TestFrameworkOrchestrator.ts +++ b/packages/core/src/TestFrameworkOrchestrator.ts @@ -2,6 +2,7 @@ import { StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, PluginKind, tokens } from '@stryker-mutator/api/plugin'; import { TestFramework } from '@stryker-mutator/api/test_framework'; + import { coreTokens } from './di'; import { PluginCreator } from './di/PluginCreator'; diff --git a/packages/core/src/TestableMutant.ts b/packages/core/src/TestableMutant.ts index 602d3ad79c..9c614b4812 100644 --- a/packages/core/src/TestableMutant.ts +++ b/packages/core/src/TestableMutant.ts @@ -3,6 +3,7 @@ import { Mutant } from '@stryker-mutator/api/mutant'; import { MutantResult, MutantStatus } from '@stryker-mutator/api/report'; import { TestSelection } from '@stryker-mutator/api/test_framework'; import { RunResult, TestResult } from '@stryker-mutator/api/test_runner'; + import SourceFile, { isLineBreak } from './SourceFile'; import { freezeRecursively } from './utils/objectUtils'; diff --git a/packages/core/src/child-proxy/ChildProcessProxy.ts b/packages/core/src/child-proxy/ChildProcessProxy.ts index 929d04149f..bc80619aa3 100644 --- a/packages/core/src/child-proxy/ChildProcessProxy.ts +++ b/packages/core/src/child-proxy/ChildProcessProxy.ts @@ -1,14 +1,17 @@ +import { ChildProcess, fork } from 'child_process'; +import * as os from 'os'; + import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { OptionsContext } from '@stryker-mutator/api/plugin'; import { isErrnoException } from '@stryker-mutator/util'; -import { ChildProcess, fork } from 'child_process'; import { getLogger } from 'log4js'; -import * as os from 'os'; import { Disposable, InjectableClass, InjectionToken } from 'typed-inject'; + import LoggingClientContext from '../logging/LoggingClientContext'; import { deserialize, kill, padLeft, serialize } from '../utils/objectUtils'; import StringBuilder from '../utils/StringBuilder'; import { ExpirableTask, Task } from '../utils/Task'; + import ChildProcessCrashedError from './ChildProcessCrashedError'; import { autoStart, ParentMessage, ParentMessageKind, WorkerMessage, WorkerMessageKind } from './messageProtocol'; import OutOfMemoryError from './OutOfMemoryError'; diff --git a/packages/core/src/child-proxy/ChildProcessProxyWorker.ts b/packages/core/src/child-proxy/ChildProcessProxyWorker.ts index 30c195db04..36add262dc 100644 --- a/packages/core/src/child-proxy/ChildProcessProxyWorker.ts +++ b/packages/core/src/child-proxy/ChildProcessProxyWorker.ts @@ -1,11 +1,14 @@ +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { File } from '@stryker-mutator/api/core'; import { errorToString } from '@stryker-mutator/util'; import { getLogger, Logger } from 'log4js'; -import * as path from 'path'; + import { buildChildProcessInjector } from '../di'; import LogConfigurator from '../logging/LogConfigurator'; import { deserialize, serialize } from '../utils/objectUtils'; + import { autoStart, CallMessage, ParentMessage, ParentMessageKind, WorkerMessage, WorkerMessageKind } from './messageProtocol'; export default class ChildProcessProxyWorker { diff --git a/packages/core/src/child-proxy/messageProtocol.ts b/packages/core/src/child-proxy/messageProtocol.ts index 1a24e838d1..116080c906 100644 --- a/packages/core/src/child-proxy/messageProtocol.ts +++ b/packages/core/src/child-proxy/messageProtocol.ts @@ -1,4 +1,5 @@ import { StrykerOptions } from '@stryker-mutator/api/core'; + import LoggingClientContext from '../logging/LoggingClientContext'; export enum WorkerMessageKind { diff --git a/packages/core/src/config/ConfigEditorApplier.ts b/packages/core/src/config/ConfigEditorApplier.ts index 9f78b7882f..6a0561069c 100644 --- a/packages/core/src/config/ConfigEditorApplier.ts +++ b/packages/core/src/config/ConfigEditorApplier.ts @@ -1,6 +1,7 @@ import { Config, ConfigEditor } from '@stryker-mutator/api/config'; import { commonTokens, PluginKind, PluginResolver } from '@stryker-mutator/api/plugin'; import { tokens } from 'typed-inject'; + import { coreTokens } from '../di'; import { PluginCreator } from '../di/PluginCreator'; diff --git a/packages/core/src/config/ConfigReader.ts b/packages/core/src/config/ConfigReader.ts index a63d82bbca..920b200058 100644 --- a/packages/core/src/config/ConfigReader.ts +++ b/packages/core/src/config/ConfigReader.ts @@ -1,10 +1,12 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { StrykerError } from '@stryker-mutator/util'; -import fs = require('fs'); -import * as path from 'path'; + import { coreTokens } from '../di'; export const CONFIG_SYNTAX_HELP = ' module.exports = function(config) {\n' + ' config.set({\n' + ' // your config\n' + ' });\n' + ' };'; diff --git a/packages/core/src/config/ConfigValidator.ts b/packages/core/src/config/ConfigValidator.ts index 5590d5ea37..536a4df494 100644 --- a/packages/core/src/config/ConfigValidator.ts +++ b/packages/core/src/config/ConfigValidator.ts @@ -4,6 +4,7 @@ import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { TestFramework } from '@stryker-mutator/api/test_framework'; import { StrykerError } from '@stryker-mutator/util'; + import { coreTokens } from '../di'; export default class ConfigValidator { diff --git a/packages/core/src/config/readConfig.ts b/packages/core/src/config/readConfig.ts index 8cf136771f..dec3fe2902 100644 --- a/packages/core/src/config/readConfig.ts +++ b/packages/core/src/config/readConfig.ts @@ -1,5 +1,7 @@ import { tokens } from '@stryker-mutator/api/plugin'; + import { coreTokens } from '../di'; + import ConfigReader from './ConfigReader'; export function readConfig(configReader: ConfigReader) { diff --git a/packages/core/src/di/PluginLoader.ts b/packages/core/src/di/PluginLoader.ts index 7498e47703..cb75da050a 100644 --- a/packages/core/src/di/PluginLoader.ts +++ b/packages/core/src/di/PluginLoader.ts @@ -1,9 +1,12 @@ +import * as path from 'path'; + import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, Plugin, PluginKind, PluginResolver, Plugins } from '@stryker-mutator/api/plugin'; import { fsAsPromised } from '@stryker-mutator/util'; -import * as path from 'path'; import { tokens } from 'typed-inject'; + import { importModule } from '../utils/fileUtils'; + import * as coreTokens from './coreTokens'; const IGNORED_PACKAGES = ['core', 'api', 'util']; diff --git a/packages/core/src/di/buildChildProcessInjector.ts b/packages/core/src/di/buildChildProcessInjector.ts index dfc0658f70..9e85d85f9a 100644 --- a/packages/core/src/di/buildChildProcessInjector.ts +++ b/packages/core/src/di/buildChildProcessInjector.ts @@ -2,9 +2,11 @@ import { StrykerOptions } from '@stryker-mutator/api/core'; import { commonTokens, Injector, OptionsContext, Scope, tokens } from '@stryker-mutator/api/plugin'; import { getLogger } from 'log4js'; import { rootInjector } from 'typed-inject'; -import { coreTokens } from '.'; + import { loggerFactory, mutatorDescriptorFactory, pluginResolverFactory } from './factoryMethods'; +import { coreTokens } from '.'; + export function buildChildProcessInjector(options: StrykerOptions): Injector { return rootInjector .provideValue(commonTokens.options, options) diff --git a/packages/core/src/di/buildMainInjector.ts b/packages/core/src/di/buildMainInjector.ts index 6b191f5bf7..9cff062527 100644 --- a/packages/core/src/di/buildMainInjector.ts +++ b/packages/core/src/di/buildMainInjector.ts @@ -5,14 +5,17 @@ import { Reporter } from '@stryker-mutator/api/report'; import { TestFramework } from '@stryker-mutator/api/test_framework'; import { getLogger } from 'log4js'; import { rootInjector } from 'typed-inject'; -import { coreTokens, PluginCreator } from '.'; + import { ConfigEditorApplier, readConfig } from '../config'; import ConfigReader from '../config/ConfigReader'; import BroadcastReporter from '../reporters/BroadcastReporter'; import { TemporaryDirectory } from '../utils/TemporaryDirectory'; import Timer from '../utils/Timer'; + import { loggerFactory, mutatorDescriptorFactory, optionsFactory, pluginResolverFactory, testFrameworkFactory } from './factoryMethods'; +import { coreTokens, PluginCreator } from '.'; + export interface MainContext extends OptionsContext { [coreTokens.reporter]: Required; [coreTokens.testFramework]: TestFramework | null; diff --git a/packages/core/src/di/factoryMethods.ts b/packages/core/src/di/factoryMethods.ts index 3d909b5770..cd759901f5 100644 --- a/packages/core/src/di/factoryMethods.ts +++ b/packages/core/src/di/factoryMethods.ts @@ -2,11 +2,13 @@ import { Config } from '@stryker-mutator/api/config'; import { MutatorDescriptor, StrykerOptions } from '@stryker-mutator/api/core'; import { Logger, LoggerFactoryMethod } from '@stryker-mutator/api/logging'; import { commonTokens, Injector, OptionsContext, PluginKind, PluginResolver, tokens } from '@stryker-mutator/api/plugin'; -import { coreTokens, PluginCreator, PluginLoader } from '.'; + import { ConfigEditorApplier } from '../config'; import TestFrameworkOrchestrator from '../TestFrameworkOrchestrator'; import { freezeRecursively } from '../utils/objectUtils'; +import { coreTokens, PluginCreator, PluginLoader } from '.'; + export function pluginResolverFactory( injector: Injector<{ [commonTokens.logger]: Logger; [coreTokens.pluginDescriptors]: readonly string[] }> ): PluginResolver { diff --git a/packages/core/src/di/index.ts b/packages/core/src/di/index.ts index a595a548cb..756f6e9a6d 100644 --- a/packages/core/src/di/index.ts +++ b/packages/core/src/di/index.ts @@ -1,4 +1,5 @@ import * as coreTokens from './coreTokens'; + export * from './buildMainInjector'; export * from './buildChildProcessInjector'; export * from './PluginCreator'; diff --git a/packages/core/src/initializer/NpmClient.ts b/packages/core/src/initializer/NpmClient.ts index c7863053d3..24fca321be 100644 --- a/packages/core/src/initializer/NpmClient.ts +++ b/packages/core/src/initializer/NpmClient.ts @@ -2,10 +2,12 @@ import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { errorToString } from '@stryker-mutator/util'; import { IRestResponse, RestClient } from 'typed-rest-client/RestClient'; -import { initializerTokens } from '.'; + import { PackageInfo } from './PackageInfo'; import PromptOption from './PromptOption'; +import { initializerTokens } from '.'; + interface NpmSearchResult { total: number; results: Array<{ package: PackageInfo }>; diff --git a/packages/core/src/initializer/StrykerConfigWriter.ts b/packages/core/src/initializer/StrykerConfigWriter.ts index 0beb46e414..d57c55b90f 100644 --- a/packages/core/src/initializer/StrykerConfigWriter.ts +++ b/packages/core/src/initializer/StrykerConfigWriter.ts @@ -2,10 +2,12 @@ import { StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { childProcessAsPromised, fsAsPromised } from '@stryker-mutator/util'; -import { initializerTokens } from '.'; + import PresetConfiguration from './presets/PresetConfiguration'; import PromptOption from './PromptOption'; +import { initializerTokens } from '.'; + const STRYKER_CONFIG_FILE = 'stryker.conf.js'; export default class StrykerConfigWriter { diff --git a/packages/core/src/initializer/StrykerInitializer.ts b/packages/core/src/initializer/StrykerInitializer.ts index e69d99c593..1cc76102c9 100644 --- a/packages/core/src/initializer/StrykerInitializer.ts +++ b/packages/core/src/initializer/StrykerInitializer.ts @@ -1,9 +1,11 @@ -import { Logger } from '@stryker-mutator/api/logging'; -import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import * as child from 'child_process'; -import { initializerTokens } from '.'; + +import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; +import { Logger } from '@stryker-mutator/api/logging'; + import CommandTestRunner from '../test-runner/CommandTestRunner'; import { filterEmpty } from '../utils/objectUtils'; + import NpmClient from './NpmClient'; import { PackageInfo } from './PackageInfo'; import Preset from './presets/Preset'; @@ -11,6 +13,8 @@ import PromptOption from './PromptOption'; import StrykerConfigWriter from './StrykerConfigWriter'; import { StrykerInquirer } from './StrykerInquirer'; +import { initializerTokens } from '.'; + const enum PackageManager { Npm = 'npm', Yarn = 'yarn' diff --git a/packages/core/src/initializer/StrykerInquirer.ts b/packages/core/src/initializer/StrykerInquirer.ts index 78f2e0afc6..c43e4fbe3c 100644 --- a/packages/core/src/initializer/StrykerInquirer.ts +++ b/packages/core/src/initializer/StrykerInquirer.ts @@ -1,5 +1,7 @@ import * as inquirer from 'inquirer'; + import CommandTestRunner from '../test-runner/CommandTestRunner'; + import Preset from './presets/Preset'; import PromptOption from './PromptOption'; diff --git a/packages/core/src/initializer/index.ts b/packages/core/src/initializer/index.ts index 59a7eb8897..bc27455fda 100644 --- a/packages/core/src/initializer/index.ts +++ b/packages/core/src/initializer/index.ts @@ -2,7 +2,9 @@ import { commonTokens } from '@stryker-mutator/api/plugin'; import { getLogger } from 'log4js'; import { rootInjector } from 'typed-inject'; import { RestClient } from 'typed-rest-client'; + import { loggerFactory } from '../di/factoryMethods'; + import * as initializerTokens from './initializerTokens'; import NpmClient from './NpmClient'; import StrykerConfigWriter from './StrykerConfigWriter'; diff --git a/packages/core/src/initializer/presets/AngularPreset.ts b/packages/core/src/initializer/presets/AngularPreset.ts index bc7c006c04..c0bbe77bc3 100644 --- a/packages/core/src/initializer/presets/AngularPreset.ts +++ b/packages/core/src/initializer/presets/AngularPreset.ts @@ -1,4 +1,5 @@ import * as os from 'os'; + import Preset from './Preset'; import PresetConfiguration from './PresetConfiguration'; diff --git a/packages/core/src/input/InputFileCollection.ts b/packages/core/src/input/InputFileCollection.ts index c5dcd36f4e..2c7ad95790 100644 --- a/packages/core/src/input/InputFileCollection.ts +++ b/packages/core/src/input/InputFileCollection.ts @@ -1,6 +1,7 @@ import { File } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { normalizeWhitespaces } from '@stryker-mutator/util'; + import os = require('os'); export default class InputFileCollection { diff --git a/packages/core/src/input/InputFileResolver.ts b/packages/core/src/input/InputFileResolver.ts index ed5fc5557f..155ceb2831 100644 --- a/packages/core/src/input/InputFileResolver.ts +++ b/packages/core/src/input/InputFileResolver.ts @@ -1,14 +1,17 @@ +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { SourceFile } from '@stryker-mutator/api/report'; import { childProcessAsPromised, fsAsPromised, isErrnoException, normalizeWhitespaces, StrykerError } from '@stryker-mutator/util'; -import * as path from 'path'; + import { coreTokens } from '../di'; import StrictReporter from '../reporters/StrictReporter'; import { glob } from '../utils/fileUtils'; import { filterEmpty } from '../utils/objectUtils'; + import InputFileCollection from './InputFileCollection'; function toReportSourceFile(file: File): SourceFile { diff --git a/packages/core/src/logging/LogConfigurator.ts b/packages/core/src/logging/LogConfigurator.ts index ab71aab648..eac1705e89 100644 --- a/packages/core/src/logging/LogConfigurator.ts +++ b/packages/core/src/logging/LogConfigurator.ts @@ -1,6 +1,8 @@ import { LogLevel } from '@stryker-mutator/api/core'; import * as log4js from 'log4js'; + import { getFreePort } from '../utils/netUtils'; + import LoggingClientContext from './LoggingClientContext'; import { minLevel } from './logUtils'; diff --git a/packages/core/src/mutants/MutantTestMatcher.ts b/packages/core/src/mutants/MutantTestMatcher.ts index 646926d2c1..12ebf784a0 100644 --- a/packages/core/src/mutants/MutantTestMatcher.ts +++ b/packages/core/src/mutants/MutantTestMatcher.ts @@ -4,6 +4,7 @@ import { Mutant } from '@stryker-mutator/api/mutant'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { MatchedMutant } from '@stryker-mutator/api/report'; import { CoverageCollection, CoveragePerTestResult, CoverageResult, StatementMap } from '@stryker-mutator/api/test_runner'; + import { coreTokens } from '../di'; import InputFileCollection from '../input/InputFileCollection'; import { InitialTestRunResult } from '../process/InitialTestExecutor'; diff --git a/packages/core/src/mutants/MutatorFacade.ts b/packages/core/src/mutants/MutatorFacade.ts index b3895612ba..761db861a5 100644 --- a/packages/core/src/mutants/MutatorFacade.ts +++ b/packages/core/src/mutants/MutatorFacade.ts @@ -2,6 +2,7 @@ import { File, MutatorDescriptor } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { Mutant, Mutator } from '@stryker-mutator/api/mutant'; import { commonTokens, PluginKind, tokens } from '@stryker-mutator/api/plugin'; + import { coreTokens, PluginCreator } from '../di'; export class MutatorFacade implements Mutator { diff --git a/packages/core/src/process/InitialTestExecutor.ts b/packages/core/src/process/InitialTestExecutor.ts index fa9e8eed79..ea45378bfc 100644 --- a/packages/core/src/process/InitialTestExecutor.ts +++ b/packages/core/src/process/InitialTestExecutor.ts @@ -1,10 +1,12 @@ +import { EOL } from 'os'; + import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { TestFramework } from '@stryker-mutator/api/test_framework'; import { RunResult, RunStatus, TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import { Transpiler } from '@stryker-mutator/api/transpile'; -import { EOL } from 'os'; + import { coreTokens } from '../di'; import InputFileCollection from '../input/InputFileCollection'; import LoggingClientContext from '../logging/LoggingClientContext'; diff --git a/packages/core/src/process/MutationTestExecutor.ts b/packages/core/src/process/MutationTestExecutor.ts index 696bfd2a88..8a730b1a6e 100644 --- a/packages/core/src/process/MutationTestExecutor.ts +++ b/packages/core/src/process/MutationTestExecutor.ts @@ -1,6 +1,7 @@ import { tokens } from '@stryker-mutator/api/plugin'; import { MutantResult } from '@stryker-mutator/api/report'; import { tap, toArray } from 'rxjs/operators'; + import { coreTokens } from '../di'; import StrictReporter from '../reporters/StrictReporter'; import { SandboxPool } from '../SandboxPool'; diff --git a/packages/core/src/reporters/BroadcastReporter.ts b/packages/core/src/reporters/BroadcastReporter.ts index 6e80c7598a..f6a7a3777c 100644 --- a/packages/core/src/reporters/BroadcastReporter.ts +++ b/packages/core/src/reporters/BroadcastReporter.ts @@ -3,8 +3,10 @@ import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, PluginKind } from '@stryker-mutator/api/plugin'; import { MatchedMutant, MutantResult, mutationTestReportSchema, Reporter, ScoreResult, SourceFile } from '@stryker-mutator/api/report'; import { tokens } from 'typed-inject'; + import { coreTokens } from '../di'; import { PluginCreator } from '../di/PluginCreator'; + import StrictReporter from './StrictReporter'; export default class BroadcastReporter implements StrictReporter { diff --git a/packages/core/src/reporters/ClearTextReporter.ts b/packages/core/src/reporters/ClearTextReporter.ts index b2e3ef30a3..37bdd86fea 100644 --- a/packages/core/src/reporters/ClearTextReporter.ts +++ b/packages/core/src/reporters/ClearTextReporter.ts @@ -1,11 +1,13 @@ +import * as os from 'os'; + import { Position, StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { MutantResult, MutantStatus, mutationTestReportSchema, Reporter } from '@stryker-mutator/api/report'; import chalk from 'chalk'; import { calculateMetrics } from 'mutation-testing-metrics'; -import * as os from 'os'; import { tokens } from 'typed-inject'; + import ClearTextScoreTable from './ClearTextScoreTable'; export default class ClearTextReporter implements Reporter { diff --git a/packages/core/src/reporters/ClearTextScoreTable.ts b/packages/core/src/reporters/ClearTextScoreTable.ts index 5ac5f4d268..5bebb582a8 100644 --- a/packages/core/src/reporters/ClearTextScoreTable.ts +++ b/packages/core/src/reporters/ClearTextScoreTable.ts @@ -1,8 +1,10 @@ +import * as os from 'os'; + import { MutationScoreThresholds } from '@stryker-mutator/api/core'; import chalk from 'chalk'; -import flatMap = require('lodash.flatmap'); import { MetricsResult } from 'mutation-testing-metrics'; -import * as os from 'os'; + +import flatMap = require('lodash.flatmap'); const FILES_ROOT_NAME = 'All files'; diff --git a/packages/core/src/reporters/DotsReporter.ts b/packages/core/src/reporters/DotsReporter.ts index 1d63079c13..6944eb1f5e 100644 --- a/packages/core/src/reporters/DotsReporter.ts +++ b/packages/core/src/reporters/DotsReporter.ts @@ -1,6 +1,7 @@ +import * as os from 'os'; + import { MutantResult, MutantStatus, Reporter } from '@stryker-mutator/api/report'; import chalk from 'chalk'; -import * as os from 'os'; export default class DotsReporter implements Reporter { public onMutantTested(result: MutantResult) { diff --git a/packages/core/src/reporters/EventRecorderReporter.ts b/packages/core/src/reporters/EventRecorderReporter.ts index cb1241601d..756bc4fafb 100644 --- a/packages/core/src/reporters/EventRecorderReporter.ts +++ b/packages/core/src/reporters/EventRecorderReporter.ts @@ -1,10 +1,13 @@ +import * as path from 'path'; + import { StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { MatchedMutant, MutantResult, mutationTestReportSchema, Reporter, ScoreResult, SourceFile } from '@stryker-mutator/api/report'; import { fsAsPromised } from '@stryker-mutator/util'; -import * as path from 'path'; + import { cleanFolder } from '../utils/fileUtils'; + import StrictReporter from './StrictReporter'; const DEFAULT_BASE_FOLDER = 'reports/mutation/events'; diff --git a/packages/core/src/reporters/MutationTestReportCalculator.ts b/packages/core/src/reporters/MutationTestReportCalculator.ts index f6c2637a74..aac96ae790 100644 --- a/packages/core/src/reporters/MutationTestReportCalculator.ts +++ b/packages/core/src/reporters/MutationTestReportCalculator.ts @@ -1,9 +1,11 @@ +import * as path from 'path'; + import { Location, Position, StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { MutantResult, MutantStatus, mutationTestReportSchema, Reporter } from '@stryker-mutator/api/report'; import { normalizeWhitespaces } from '@stryker-mutator/util'; -import * as path from 'path'; + import { coreTokens } from '../di'; import InputFileCollection from '../input/InputFileCollection'; diff --git a/packages/core/src/reporters/ProgressAppendOnlyReporter.ts b/packages/core/src/reporters/ProgressAppendOnlyReporter.ts index 329cceeedf..aa7f686112 100644 --- a/packages/core/src/reporters/ProgressAppendOnlyReporter.ts +++ b/packages/core/src/reporters/ProgressAppendOnlyReporter.ts @@ -1,5 +1,7 @@ -import { MatchedMutant } from '@stryker-mutator/api/report'; import * as os from 'os'; + +import { MatchedMutant } from '@stryker-mutator/api/report'; + import ProgressKeeper from './ProgressKeeper'; export default class ProgressAppendOnlyReporter extends ProgressKeeper { diff --git a/packages/core/src/reporters/ProgressKeeper.ts b/packages/core/src/reporters/ProgressKeeper.ts index 2dd6d4468b..59709133e6 100644 --- a/packages/core/src/reporters/ProgressKeeper.ts +++ b/packages/core/src/reporters/ProgressKeeper.ts @@ -1,5 +1,6 @@ import { MatchedMutant, MutantResult, Reporter } from '@stryker-mutator/api/report'; import { MutantStatus } from '@stryker-mutator/api/report'; + import Timer from '../utils/Timer'; abstract class ProgressKeeper implements Reporter { diff --git a/packages/core/src/reporters/ProgressReporter.ts b/packages/core/src/reporters/ProgressReporter.ts index ee61347d14..d4c37b4387 100644 --- a/packages/core/src/reporters/ProgressReporter.ts +++ b/packages/core/src/reporters/ProgressReporter.ts @@ -1,4 +1,5 @@ import { MatchedMutant, MutantResult } from '@stryker-mutator/api/report'; + import ProgressBar from './ProgressBar'; import ProgressKeeper from './ProgressKeeper'; diff --git a/packages/core/src/reporters/ci/CircleProvider.ts b/packages/core/src/reporters/ci/CircleProvider.ts index ccc9e9d954..913594ccd3 100644 --- a/packages/core/src/reporters/ci/CircleProvider.ts +++ b/packages/core/src/reporters/ci/CircleProvider.ts @@ -1,7 +1,7 @@ -import { CIProvider } from './Provider'; - import { getEnvironmentVariable } from '../../utils/objectUtils'; +import { CIProvider } from './Provider'; + class CircleProvider implements CIProvider { public isPullRequest = () => getEnvironmentVariable('CIRCLE_PULL_REQUEST') !== undefined; diff --git a/packages/core/src/reporters/ci/Provider.ts b/packages/core/src/reporters/ci/Provider.ts index 8bbcccdef6..ed3d0f2b20 100644 --- a/packages/core/src/reporters/ci/Provider.ts +++ b/packages/core/src/reporters/ci/Provider.ts @@ -1,8 +1,8 @@ +import { getEnvironmentVariable } from '../../utils/objectUtils'; + import CircleProvider from './CircleProvider'; import TravisProvider from './TravisProvider'; -import { getEnvironmentVariable } from '../../utils/objectUtils'; - /** * Represents an object that can provide information about a CI/CD provider. */ diff --git a/packages/core/src/reporters/ci/TravisProvider.ts b/packages/core/src/reporters/ci/TravisProvider.ts index 57ac005cfc..8a39c33e10 100644 --- a/packages/core/src/reporters/ci/TravisProvider.ts +++ b/packages/core/src/reporters/ci/TravisProvider.ts @@ -1,7 +1,7 @@ -import { CIProvider } from './Provider'; - import { getEnvironmentVariable } from '../../utils/objectUtils'; +import { CIProvider } from './Provider'; + class TravisReporter implements CIProvider { public isPullRequest = () => getEnvironmentVariable('TRAVIS_PULL_REQUEST') !== 'false'; diff --git a/packages/core/src/reporters/dashboard-reporter/DashboardReporter.ts b/packages/core/src/reporters/dashboard-reporter/DashboardReporter.ts index 354812d3e6..e9a567d310 100644 --- a/packages/core/src/reporters/dashboard-reporter/DashboardReporter.ts +++ b/packages/core/src/reporters/dashboard-reporter/DashboardReporter.ts @@ -2,8 +2,10 @@ import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { mutationTestReportSchema, Reporter } from '@stryker-mutator/api/report'; import { calculateMetrics } from 'mutation-testing-metrics'; + import { getEnvironmentVariable } from '../../utils/objectUtils'; import { determineCIProvider } from '../ci/Provider'; + import DashboardReporterClient from './DashboardReporterClient'; import { dashboardReporterTokens } from './tokens'; diff --git a/packages/core/src/reporters/dashboard-reporter/DashboardReporterClient.ts b/packages/core/src/reporters/dashboard-reporter/DashboardReporterClient.ts index d10d930c15..b52517fc0c 100644 --- a/packages/core/src/reporters/dashboard-reporter/DashboardReporterClient.ts +++ b/packages/core/src/reporters/dashboard-reporter/DashboardReporterClient.ts @@ -2,6 +2,7 @@ import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { errorToString } from '@stryker-mutator/util'; import { HttpClient } from 'typed-rest-client/HttpClient'; + import { dashboardReporterTokens } from './tokens'; export interface StrykerDashboardReport { diff --git a/packages/core/src/reporters/dashboard-reporter/index.ts b/packages/core/src/reporters/dashboard-reporter/index.ts index 5da9136ec9..3456a6b87f 100644 --- a/packages/core/src/reporters/dashboard-reporter/index.ts +++ b/packages/core/src/reporters/dashboard-reporter/index.ts @@ -1,5 +1,6 @@ import { commonTokens, Injector, OptionsContext, tokens } from '@stryker-mutator/api/plugin'; import { HttpClient } from 'typed-rest-client/HttpClient'; + import DashboardReporter from './DashboardReporter'; import DashboardReporterClient from './DashboardReporterClient'; import { dashboardReporterTokens } from './tokens'; diff --git a/packages/core/src/reporters/index.ts b/packages/core/src/reporters/index.ts index 73606c8d4f..8438ec536a 100644 --- a/packages/core/src/reporters/index.ts +++ b/packages/core/src/reporters/index.ts @@ -1,4 +1,5 @@ import { declareClassPlugin, declareFactoryPlugin, PluginKind } from '@stryker-mutator/api/plugin'; + import ClearTextReporter from './ClearTextReporter'; import { dashboardReporterFactory } from './dashboard-reporter'; import DotsReporter from './DotsReporter'; diff --git a/packages/core/src/test-runner/ChildProcessTestRunnerDecorator.ts b/packages/core/src/test-runner/ChildProcessTestRunnerDecorator.ts index a362a50f38..c31053cd36 100644 --- a/packages/core/src/test-runner/ChildProcessTestRunnerDecorator.ts +++ b/packages/core/src/test-runner/ChildProcessTestRunnerDecorator.ts @@ -1,9 +1,11 @@ import { StrykerOptions } from '@stryker-mutator/api/core'; import { RunOptions, RunResult, TestRunner } from '@stryker-mutator/api/test_runner'; + import ChildProcessCrashedError from '../child-proxy/ChildProcessCrashedError'; import ChildProcessProxy from '../child-proxy/ChildProcessProxy'; import LoggingClientContext from '../logging/LoggingClientContext'; import { timeout } from '../utils/objectUtils'; + import { ChildProcessTestRunnerWorker } from './ChildProcessTestRunnerWorker'; const MAX_WAIT_FOR_DISPOSE = 2000; diff --git a/packages/core/src/test-runner/ChildProcessTestRunnerWorker.ts b/packages/core/src/test-runner/ChildProcessTestRunnerWorker.ts index 2215904a6f..8cad8100c8 100644 --- a/packages/core/src/test-runner/ChildProcessTestRunnerWorker.ts +++ b/packages/core/src/test-runner/ChildProcessTestRunnerWorker.ts @@ -2,6 +2,7 @@ import { StrykerOptions } from '@stryker-mutator/api/core'; import { commonTokens, Injector, OptionsContext, PluginKind, tokens } from '@stryker-mutator/api/plugin'; import { RunOptions, TestRunner } from '@stryker-mutator/api/test_runner'; import { errorToString } from '@stryker-mutator/util'; + import { PluginCreator } from '../di'; export class ChildProcessTestRunnerWorker implements TestRunner { diff --git a/packages/core/src/test-runner/CommandTestRunner.ts b/packages/core/src/test-runner/CommandTestRunner.ts index d90edbaa82..dbf2a80a5c 100644 --- a/packages/core/src/test-runner/CommandTestRunner.ts +++ b/packages/core/src/test-runner/CommandTestRunner.ts @@ -1,8 +1,10 @@ +import { exec } from 'child_process'; +import * as os from 'os'; + import { StrykerOptions } from '@stryker-mutator/api/core'; import { RunResult, RunStatus, TestRunner, TestStatus } from '@stryker-mutator/api/test_runner'; import { errorToString } from '@stryker-mutator/util'; -import { exec } from 'child_process'; -import * as os from 'os'; + import { kill } from '../utils/objectUtils'; import Timer from '../utils/Timer'; diff --git a/packages/core/src/test-runner/ResilientTestRunnerFactory.ts b/packages/core/src/test-runner/ResilientTestRunnerFactory.ts index 246b18f189..a9d11211a7 100644 --- a/packages/core/src/test-runner/ResilientTestRunnerFactory.ts +++ b/packages/core/src/test-runner/ResilientTestRunnerFactory.ts @@ -1,7 +1,9 @@ import { StrykerOptions } from '@stryker-mutator/api/core'; import { TestRunner } from '@stryker-mutator/api/test_runner'; + import LoggingClientContext from '../logging/LoggingClientContext'; import CommandTestRunner from '../test-runner/CommandTestRunner'; + import ChildProcessTestRunnerDecorator from './ChildProcessTestRunnerDecorator'; import RetryDecorator from './RetryDecorator'; import TimeoutDecorator from './TimeoutDecorator'; diff --git a/packages/core/src/test-runner/RetryDecorator.ts b/packages/core/src/test-runner/RetryDecorator.ts index cd88c08e99..65ccf1683b 100644 --- a/packages/core/src/test-runner/RetryDecorator.ts +++ b/packages/core/src/test-runner/RetryDecorator.ts @@ -1,7 +1,9 @@ import { RunOptions, RunResult, RunStatus } from '@stryker-mutator/api/test_runner'; import { errorToString } from '@stryker-mutator/util'; import { getLogger } from 'log4js'; + import OutOfMemoryError from '../child-proxy/OutOfMemoryError'; + import TestRunnerDecorator from './TestRunnerDecorator'; const ERROR_MESSAGE = 'Test runner crashed. Tried twice to restart it without any luck. Last time the error message was: '; diff --git a/packages/core/src/test-runner/TimeoutDecorator.ts b/packages/core/src/test-runner/TimeoutDecorator.ts index fd10ab82b7..f6c38e49ca 100644 --- a/packages/core/src/test-runner/TimeoutDecorator.ts +++ b/packages/core/src/test-runner/TimeoutDecorator.ts @@ -1,6 +1,8 @@ import { RunOptions, RunResult, RunStatus } from '@stryker-mutator/api/test_runner'; import { getLogger } from 'log4js'; + import { timeout, TimeoutExpired } from '../utils/objectUtils'; + import TestRunnerDecorator from './TestRunnerDecorator'; /** diff --git a/packages/core/src/transpiler/ChildProcessTranspiler.ts b/packages/core/src/transpiler/ChildProcessTranspiler.ts index 3e3cd94313..a207d24c06 100644 --- a/packages/core/src/transpiler/ChildProcessTranspiler.ts +++ b/packages/core/src/transpiler/ChildProcessTranspiler.ts @@ -2,9 +2,11 @@ import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { Transpiler } from '@stryker-mutator/api/transpile'; import { Disposable } from 'typed-inject'; + import ChildProcessProxy from '../child-proxy/ChildProcessProxy'; import { coreTokens } from '../di'; import LoggingClientContext from '../logging/LoggingClientContext'; + import { ChildProcessTranspilerWorker } from './ChildProcessTranspilerWorker'; export class ChildProcessTranspiler implements Transpiler, Disposable { diff --git a/packages/core/src/transpiler/ChildProcessTranspilerWorker.ts b/packages/core/src/transpiler/ChildProcessTranspilerWorker.ts index 0d267562ca..b2bacc1c31 100644 --- a/packages/core/src/transpiler/ChildProcessTranspilerWorker.ts +++ b/packages/core/src/transpiler/ChildProcessTranspilerWorker.ts @@ -2,8 +2,10 @@ import { File } from '@stryker-mutator/api/core'; import { commonTokens, PluginKind, TranspilerPluginContext } from '@stryker-mutator/api/plugin'; import { Transpiler } from '@stryker-mutator/api/transpile'; import { Injector } from 'typed-inject'; + import { coreTokens } from '../di'; import { PluginCreator } from '../di/PluginCreator'; + import { TranspilerFacade } from './TranspilerFacade'; export class ChildProcessTranspilerWorker implements Transpiler { diff --git a/packages/core/src/transpiler/CoverageInstrumenterTranspiler.ts b/packages/core/src/transpiler/CoverageInstrumenterTranspiler.ts index de54ebfdcf..b60f96bc5e 100644 --- a/packages/core/src/transpiler/CoverageInstrumenterTranspiler.ts +++ b/packages/core/src/transpiler/CoverageInstrumenterTranspiler.ts @@ -3,6 +3,7 @@ import { Transpiler } from '@stryker-mutator/api/transpile'; import { StrykerError } from '@stryker-mutator/util'; import { FileCoverageData, Range } from 'istanbul-lib-coverage'; import { createInstrumenter, Instrumenter } from 'istanbul-lib-instrument'; + import { COVERAGE_CURRENT_TEST_VARIABLE_NAME } from './coverageHooks'; export interface CoverageMaps { diff --git a/packages/core/src/transpiler/MutantTranspileScheduler.ts b/packages/core/src/transpiler/MutantTranspileScheduler.ts index d906784c5e..309715caef 100644 --- a/packages/core/src/transpiler/MutantTranspileScheduler.ts +++ b/packages/core/src/transpiler/MutantTranspileScheduler.ts @@ -7,10 +7,12 @@ import { Observable, range } from 'rxjs'; import { BehaviorSubject } from 'rxjs'; import { from } from 'rxjs'; import { flatMap, zip } from 'rxjs/operators'; + import { coreTokens } from '../di'; import SourceFile from '../SourceFile'; import TestableMutant from '../TestableMutant'; import TranspiledMutant from '../TranspiledMutant'; + import TranspileResult from './TranspileResult'; const INITIAL_CONCURRENCY = 100; diff --git a/packages/core/src/transpiler/SourceMapper.ts b/packages/core/src/transpiler/SourceMapper.ts index a8dece6586..5af4c4a529 100644 --- a/packages/core/src/transpiler/SourceMapper.ts +++ b/packages/core/src/transpiler/SourceMapper.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { File, Location, Position, StrykerOptions } from '@stryker-mutator/api/core'; import { StrykerError } from '@stryker-mutator/util'; import { getLogger } from 'log4js'; -import * as path from 'path'; import { RawSourceMap, SourceMapConsumer } from 'source-map'; + import { base64Decode } from '../utils/objectUtils'; const SOURCE_MAP_URL_REGEX = /\/\/\s*#\s*sourceMappingURL=(.*)/g; diff --git a/packages/core/src/transpiler/TranspilerFacade.ts b/packages/core/src/transpiler/TranspilerFacade.ts index a7d8a607e0..1f80ec2393 100644 --- a/packages/core/src/transpiler/TranspilerFacade.ts +++ b/packages/core/src/transpiler/TranspilerFacade.ts @@ -2,6 +2,7 @@ import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { commonTokens, PluginKind, tokens } from '@stryker-mutator/api/plugin'; import { Transpiler } from '@stryker-mutator/api/transpile'; import { StrykerError } from '@stryker-mutator/util'; + import { coreTokens } from '../di'; import { PluginCreator } from '../di/PluginCreator'; diff --git a/packages/core/src/transpiler/coverageHooks.ts b/packages/core/src/transpiler/coverageHooks.ts index ccff7b8396..3561ae98c5 100644 --- a/packages/core/src/transpiler/coverageHooks.ts +++ b/packages/core/src/transpiler/coverageHooks.ts @@ -1,4 +1,5 @@ import { TestFramework } from '@stryker-mutator/api/test_framework'; + import { wrapInClosure } from '../utils/objectUtils'; export const COVERAGE_CURRENT_TEST_VARIABLE_NAME = '__strykerCoverageCurrentTest__'; diff --git a/packages/core/src/transpiler/index.ts b/packages/core/src/transpiler/index.ts index 1acf55fbf7..95aeee6629 100644 --- a/packages/core/src/transpiler/index.ts +++ b/packages/core/src/transpiler/index.ts @@ -1,8 +1,10 @@ import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { commonTokens, Disposable, Injector, tokens, TranspilerPluginContext } from '@stryker-mutator/api/plugin'; import { Transpiler } from '@stryker-mutator/api/transpile'; + import { coreTokens } from '../di'; import LoggingClientContext from '../logging/LoggingClientContext'; + import { ChildProcessTranspiler } from './ChildProcessTranspiler'; /** diff --git a/packages/core/src/utils/TemporaryDirectory.ts b/packages/core/src/utils/TemporaryDirectory.ts index e85a78a6f4..f1b06cb20b 100644 --- a/packages/core/src/utils/TemporaryDirectory.ts +++ b/packages/core/src/utils/TemporaryDirectory.ts @@ -1,10 +1,12 @@ +import * as path from 'path'; + import { StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { fsAsPromised } from '@stryker-mutator/util'; import * as mkdirp from 'mkdirp'; -import * as path from 'path'; import { Disposable } from 'typed-inject'; + import { deleteDir } from './fileUtils'; export class TemporaryDirectory implements Disposable { diff --git a/packages/core/src/utils/fileUtils.ts b/packages/core/src/utils/fileUtils.ts index 4d880c5f4b..53f7bdd52d 100644 --- a/packages/core/src/utils/fileUtils.ts +++ b/packages/core/src/utils/fileUtils.ts @@ -1,7 +1,8 @@ +import * as path from 'path'; + import { fsAsPromised } from '@stryker-mutator/util'; import * as nodeGlob from 'glob'; import * as mkdirp from 'mkdirp'; -import * as path from 'path'; import * as rimraf from 'rimraf'; export function glob(expression: string): Promise { diff --git a/packages/core/test/helpers/LoggingServer.ts b/packages/core/test/helpers/LoggingServer.ts index 0152d555f0..3edb1583d0 100644 --- a/packages/core/test/helpers/LoggingServer.ts +++ b/packages/core/test/helpers/LoggingServer.ts @@ -1,6 +1,7 @@ +import * as net from 'net'; + import { parse } from 'flatted'; import * as log4js from 'log4js'; -import * as net from 'net'; import { Observable, Subscriber } from 'rxjs'; export default class LoggingServer { diff --git a/packages/core/test/helpers/initChai.ts b/packages/core/test/helpers/initChai.ts index 0d0431d54a..514154da42 100644 --- a/packages/core/test/helpers/initChai.ts +++ b/packages/core/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/core/test/helpers/logMock.ts b/packages/core/test/helpers/logMock.ts index 6a53bc908b..7b0dd67b5c 100644 --- a/packages/core/test/helpers/logMock.ts +++ b/packages/core/test/helpers/logMock.ts @@ -1,5 +1,6 @@ import * as logging from 'log4js'; import * as sinon from 'sinon'; + import { logger, Mock } from './producers'; let log: Mock; diff --git a/packages/core/test/helpers/producers.ts b/packages/core/test/helpers/producers.ts index 95198f32a1..eaa464c7b8 100644 --- a/packages/core/test/helpers/producers.ts +++ b/packages/core/test/helpers/producers.ts @@ -3,6 +3,7 @@ import { factory } from '@stryker-mutator/test-helpers'; import { FileCoverageData } from 'istanbul-lib-coverage'; import { Logger } from 'log4js'; import * as sinon from 'sinon'; + import SourceFile from '../../src/SourceFile'; import TestableMutant from '../../src/TestableMutant'; import TranspiledMutant from '../../src/TranspiledMutant'; diff --git a/packages/core/test/integration/child-proxy/ChildProcessProxy.it.spec.ts b/packages/core/test/integration/child-proxy/ChildProcessProxy.it.spec.ts index 32ec17e4a4..b1d0add8db 100644 --- a/packages/core/test/integration/child-proxy/ChildProcessProxy.it.spec.ts +++ b/packages/core/test/integration/child-proxy/ChildProcessProxy.it.spec.ts @@ -1,12 +1,15 @@ +import * as path from 'path'; + import { File, LogLevel } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import getPort = require('get-port'); import * as log4js from 'log4js'; -import * as path from 'path'; import { filter } from 'rxjs/operators'; + +import getPort = require('get-port'); + import ChildProcessCrashedError from '../../../src/child-proxy/ChildProcessCrashedError'; import ChildProcessProxy from '../../../src/child-proxy/ChildProcessProxy'; import OutOfMemoryError from '../../../src/child-proxy/OutOfMemoryError'; @@ -15,6 +18,7 @@ import LoggingServer from '../../helpers/LoggingServer'; import currentLogMock from '../../helpers/logMock'; import { Mock } from '../../helpers/producers'; import { sleep } from '../../helpers/testUtils'; + import { Echo } from './Echo'; describe(ChildProcessProxy.name, () => { diff --git a/packages/core/test/integration/command-test-runner/CommandTestRunner.it.spec.ts b/packages/core/test/integration/command-test-runner/CommandTestRunner.it.spec.ts index e4abdc00bd..de63a63c42 100644 --- a/packages/core/test/integration/command-test-runner/CommandTestRunner.it.spec.ts +++ b/packages/core/test/integration/command-test-runner/CommandTestRunner.it.spec.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { RunStatus, TestStatus } from '@stryker-mutator/api/test_runner'; import { expect } from 'chai'; -import * as path from 'path'; import * as sinon from 'sinon'; + import CommandTestRunner, { CommandRunnerSettings } from '../../../src/test-runner/CommandTestRunner'; import * as objectUtils from '../../../src/utils/objectUtils'; diff --git a/packages/core/test/integration/config-reader/ConfigReader.it.spec.ts b/packages/core/test/integration/config-reader/ConfigReader.it.spec.ts index 7a4dc102c5..d481da21dc 100644 --- a/packages/core/test/integration/config-reader/ConfigReader.it.spec.ts +++ b/packages/core/test/integration/config-reader/ConfigReader.it.spec.ts @@ -1,9 +1,11 @@ +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { StrykerOptions } from '@stryker-mutator/api/core'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as path from 'path'; import * as sinon from 'sinon'; + import ConfigReader from '../../../src/config/ConfigReader'; import { coreTokens } from '../../../src/di'; diff --git a/packages/core/test/integration/source-mapper/SourceMapper.it.spec.ts b/packages/core/test/integration/source-mapper/SourceMapper.it.spec.ts index db2714d72f..3f461c6a45 100644 --- a/packages/core/test/integration/source-mapper/SourceMapper.it.spec.ts +++ b/packages/core/test/integration/source-mapper/SourceMapper.it.spec.ts @@ -1,7 +1,9 @@ +import * as path from 'path'; + import { File } from '@stryker-mutator/api/core'; import { fsAsPromised } from '@stryker-mutator/util'; import { expect } from 'chai'; -import * as path from 'path'; + import { TranspiledSourceMapper } from '../../../src/transpiler/SourceMapper'; function resolve(...filePart: string[]) { diff --git a/packages/core/test/integration/test-runner/AdditionalTestRunners.ts b/packages/core/test/integration/test-runner/AdditionalTestRunners.ts index 5d10f99ff0..11e5e27b12 100644 --- a/packages/core/test/integration/test-runner/AdditionalTestRunners.ts +++ b/packages/core/test/integration/test-runner/AdditionalTestRunners.ts @@ -1,7 +1,8 @@ +import { isRegExp } from 'util'; + import { StrykerOptions } from '@stryker-mutator/api/core'; import { commonTokens, declareClassPlugin, PluginKind, tokens } from '@stryker-mutator/api/plugin'; import { RunResult, RunStatus, TestRunner } from '@stryker-mutator/api/test_runner'; -import { isRegExp } from 'util'; class CoverageReportingTestRunner implements TestRunner { public run() { diff --git a/packages/core/test/integration/test-runner/ResilientTestRunnerFactory.it.spec.ts b/packages/core/test/integration/test-runner/ResilientTestRunnerFactory.it.spec.ts index cc1365d400..1ceb6ffe7d 100644 --- a/packages/core/test/integration/test-runner/ResilientTestRunnerFactory.it.spec.ts +++ b/packages/core/test/integration/test-runner/ResilientTestRunnerFactory.it.spec.ts @@ -1,11 +1,14 @@ +import * as path from 'path'; + import { LogLevel, StrykerOptions } from '@stryker-mutator/api/core'; import { RunStatus, TestRunner } from '@stryker-mutator/api/test_runner'; import { strykerOptions } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; -import getPort = require('get-port'); import * as log4js from 'log4js'; -import * as path from 'path'; import { toArray } from 'rxjs/operators'; + +import getPort = require('get-port'); + import LoggingClientContext from '../../../src/logging/LoggingClientContext'; import ResilientTestRunnerFactory from '../../../src/test-runner/ResilientTestRunnerFactory'; import LoggingServer from '../../helpers/LoggingServer'; diff --git a/packages/core/test/integration/utils/fileUtils.spec.ts b/packages/core/test/integration/utils/fileUtils.spec.ts index 47192806e9..c76473b131 100644 --- a/packages/core/test/integration/utils/fileUtils.spec.ts +++ b/packages/core/test/integration/utils/fileUtils.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import * as fileUtils from '../../../src/utils/fileUtils'; describe('fileUtils', () => { diff --git a/packages/core/test/unit/Sandbox.spec.ts b/packages/core/test/unit/Sandbox.spec.ts index abcd047bb8..ce565988bf 100644 --- a/packages/core/test/unit/Sandbox.spec.ts +++ b/packages/core/test/unit/Sandbox.spec.ts @@ -1,3 +1,5 @@ +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { File, LogLevel } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; @@ -9,8 +11,8 @@ import { mutant as createMutant, fileAlreadyExistsError, testResult } from '@str import { normalizeWhitespaces } from '@stryker-mutator/util'; import { expect } from 'chai'; import * as mkdirp from 'mkdirp'; -import * as path from 'path'; import * as sinon from 'sinon'; + import LoggingClientContext from '../../src/logging/LoggingClientContext'; import Sandbox from '../../src/Sandbox'; import SourceFile from '../../src/SourceFile'; diff --git a/packages/core/test/unit/SandboxPool.spec.ts b/packages/core/test/unit/SandboxPool.spec.ts index fe73a2bf4b..e80fb12cd2 100644 --- a/packages/core/test/unit/SandboxPool.spec.ts +++ b/packages/core/test/unit/SandboxPool.spec.ts @@ -1,3 +1,5 @@ +import * as os from 'os'; + import { File, LogLevel } from '@stryker-mutator/api/core'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { MutantResult } from '@stryker-mutator/api/report'; @@ -6,10 +8,10 @@ import { RunStatus } from '@stryker-mutator/api/test_runner'; import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { file, testFramework } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; -import * as os from 'os'; import { from } from 'rxjs'; import { toArray } from 'rxjs/operators'; import * as sinon from 'sinon'; + import { coreTokens } from '../../src/di'; import LoggingClientContext from '../../src/logging/LoggingClientContext'; import { InitialTestRunResult } from '../../src/process/InitialTestExecutor'; diff --git a/packages/core/test/unit/ScoreResultCalculator.spec.ts b/packages/core/test/unit/ScoreResultCalculator.spec.ts index 51a943e210..7d7d0c23a4 100644 --- a/packages/core/test/unit/ScoreResultCalculator.spec.ts +++ b/packages/core/test/unit/ScoreResultCalculator.spec.ts @@ -1,9 +1,11 @@ +import * as path from 'path'; + import { MutantStatus, ScoreResult } from '@stryker-mutator/api/report'; import { testInjector } from '@stryker-mutator/test-helpers'; import { mutantResult, mutationScoreThresholds, scoreResult } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; -import * as path from 'path'; import * as sinon from 'sinon'; + import ScoreResultCalculator from '../../src/ScoreResultCalculator'; import * as objectUtils from '../../src/utils/objectUtils'; diff --git a/packages/core/test/unit/SourceFile.spec.ts b/packages/core/test/unit/SourceFile.spec.ts index 49cc78e4f3..d71ce1716f 100644 --- a/packages/core/test/unit/SourceFile.spec.ts +++ b/packages/core/test/unit/SourceFile.spec.ts @@ -1,5 +1,6 @@ import { File } from '@stryker-mutator/api/core'; import { expect } from 'chai'; + import SourceFile from '../../src/SourceFile'; const content = ` diff --git a/packages/core/test/unit/Stryker.spec.ts b/packages/core/test/unit/Stryker.spec.ts index 383289dfe2..3397072d66 100644 --- a/packages/core/test/unit/Stryker.spec.ts +++ b/packages/core/test/unit/Stryker.spec.ts @@ -11,6 +11,7 @@ import { mutantResult, runResult, testFramework } from '@stryker-mutator/test-he import { expect } from 'chai'; import * as sinon from 'sinon'; import * as typedInject from 'typed-inject'; + import * as di from '../../src/di'; import InputFileCollection from '../../src/input/InputFileCollection'; import InputFileResolver from '../../src/input/InputFileResolver'; diff --git a/packages/core/test/unit/TestFrameworkOrchestrator.spec.ts b/packages/core/test/unit/TestFrameworkOrchestrator.spec.ts index 9172c6f16a..8482822dc3 100644 --- a/packages/core/test/unit/TestFrameworkOrchestrator.spec.ts +++ b/packages/core/test/unit/TestFrameworkOrchestrator.spec.ts @@ -2,6 +2,7 @@ import { PluginKind } from '@stryker-mutator/api/plugin'; import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import { coreTokens } from '../../src/di'; import { PluginCreator } from '../../src/di/PluginCreator'; import TestFrameworkOrchestrator from '../../src/TestFrameworkOrchestrator'; diff --git a/packages/core/test/unit/TestableMutant.spec.ts b/packages/core/test/unit/TestableMutant.spec.ts index 6941590741..04335092ee 100644 --- a/packages/core/test/unit/TestableMutant.spec.ts +++ b/packages/core/test/unit/TestableMutant.spec.ts @@ -2,6 +2,7 @@ import { File } from '@stryker-mutator/api/core'; import { Mutant } from '@stryker-mutator/api/mutant'; import { mutant, runResult, testResult } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; + import SourceFile from '../../src/SourceFile'; import TestableMutant, { TestSelectionResult } from '../../src/TestableMutant'; diff --git a/packages/core/test/unit/child-proxy/ChildProcessProxy.spec.ts b/packages/core/test/unit/child-proxy/ChildProcessProxy.spec.ts index 9f78311d8a..c205f0d6ea 100644 --- a/packages/core/test/unit/child-proxy/ChildProcessProxy.spec.ts +++ b/packages/core/test/unit/child-proxy/ChildProcessProxy.spec.ts @@ -1,11 +1,13 @@ +import * as childProcess from 'child_process'; +import { EventEmitter } from 'events'; +import * as os from 'os'; + import { LogLevel, StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { factory } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as childProcess from 'child_process'; -import { EventEmitter } from 'events'; -import * as os from 'os'; import * as sinon from 'sinon'; + import ChildProcessProxy from '../../../src/child-proxy/ChildProcessProxy'; import { autoStart, @@ -21,6 +23,7 @@ import { serialize } from '../../../src/utils/objectUtils'; import * as objectUtils from '../../../src/utils/objectUtils'; import currentLogMock from '../../helpers/logMock'; import { Mock } from '../../helpers/producers'; + import { HelloClass } from './HelloClass'; const LOGGING_CONTEXT: LoggingClientContext = Object.freeze({ diff --git a/packages/core/test/unit/child-proxy/ChildProcessWorker.spec.ts b/packages/core/test/unit/child-proxy/ChildProcessWorker.spec.ts index 1fd6d86027..8cd25e46f0 100644 --- a/packages/core/test/unit/child-proxy/ChildProcessWorker.spec.ts +++ b/packages/core/test/unit/child-proxy/ChildProcessWorker.spec.ts @@ -1,10 +1,12 @@ +import * as path from 'path'; + import { LogLevel } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { factory } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as path from 'path'; import * as sinon from 'sinon'; import { rootInjector } from 'typed-inject'; + import ChildProcessProxyWorker from '../../../src/child-proxy/ChildProcessProxyWorker'; import { CallMessage, @@ -21,6 +23,7 @@ import LoggingClientContext from '../../../src/logging/LoggingClientContext'; import { serialize } from '../../../src/utils/objectUtils'; import currentLogMock from '../../helpers/logMock'; import { Mock } from '../../helpers/producers'; + import { HelloClass } from './HelloClass'; const LOGGING_CONTEXT: LoggingClientContext = Object.freeze({ port: 4200, level: LogLevel.Fatal }); diff --git a/packages/core/test/unit/config/ConfigEditorApplier.spec.ts b/packages/core/test/unit/config/ConfigEditorApplier.spec.ts index c3dc616d7c..124a3f1ba4 100644 --- a/packages/core/test/unit/config/ConfigEditorApplier.spec.ts +++ b/packages/core/test/unit/config/ConfigEditorApplier.spec.ts @@ -2,6 +2,7 @@ import { PluginKind } from '@stryker-mutator/api/plugin'; import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import { ConfigEditorApplier } from '../../../src/config/ConfigEditorApplier'; import { coreTokens } from '../../../src/di'; import { PluginCreator } from '../../../src/di/PluginCreator'; diff --git a/packages/core/test/unit/config/ConfigValidator.spec.ts b/packages/core/test/unit/config/ConfigValidator.spec.ts index 7c637a921c..9cfd02ce0d 100644 --- a/packages/core/test/unit/config/ConfigValidator.spec.ts +++ b/packages/core/test/unit/config/ConfigValidator.spec.ts @@ -2,6 +2,7 @@ import { StrykerOptions } from '@stryker-mutator/api/core'; import { TestFramework } from '@stryker-mutator/api/test_framework'; import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; + import ConfigValidator from '../../../src/config/ConfigValidator'; import { coreTokens } from '../../../src/di'; diff --git a/packages/core/test/unit/di/PluginCreator.spec.ts b/packages/core/test/unit/di/PluginCreator.spec.ts index 0ca4c4f841..a113c9b451 100644 --- a/packages/core/test/unit/di/PluginCreator.spec.ts +++ b/packages/core/test/unit/di/PluginCreator.spec.ts @@ -1,6 +1,7 @@ import { ClassPlugin, FactoryPlugin, PluginKind } from '@stryker-mutator/api/plugin'; import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; + import { PluginCreator } from '../../../src/di/PluginCreator'; describe('PluginCreator', () => { diff --git a/packages/core/test/unit/di/PluginLoaderSpec.ts b/packages/core/test/unit/di/PluginLoaderSpec.ts index b0e0f66271..0fe6b51bd2 100644 --- a/packages/core/test/unit/di/PluginLoaderSpec.ts +++ b/packages/core/test/unit/di/PluginLoaderSpec.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { testInjector } from '@stryker-mutator/test-helpers'; import { fsAsPromised } from '@stryker-mutator/util'; import { expect } from 'chai'; -import * as path from 'path'; import * as sinon from 'sinon'; + import { coreTokens } from '../../../src/di'; import { PluginLoader } from '../../../src/di/PluginLoader'; import * as fileUtils from '../../../src/utils/fileUtils'; diff --git a/packages/core/test/unit/di/buildMainInjector.spec.ts b/packages/core/test/unit/di/buildMainInjector.spec.ts index 44c57e14bc..1428160236 100644 --- a/packages/core/test/unit/di/buildMainInjector.spec.ts +++ b/packages/core/test/unit/di/buildMainInjector.spec.ts @@ -5,6 +5,8 @@ import { TestFramework } from '@stryker-mutator/api/test_framework'; import { factory } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import * as sinon from 'sinon'; +import { MutatorDescriptor } from '@stryker-mutator/api/core'; + import * as configModule from '../../../src/config'; import ConfigReader, * as configReaderModule from '../../../src/config/ConfigReader'; import * as di from '../../../src/di'; @@ -13,7 +15,6 @@ import { buildMainInjector } from '../../../src/di/buildMainInjector'; import * as broadcastReporterModule from '../../../src/reporters/BroadcastReporter'; import TestFrameworkOrchestrator, * as testFrameworkOrchestratorModule from '../../../src/TestFrameworkOrchestrator'; import currentLogMock from '../../helpers/logMock'; -import { MutatorDescriptor } from '@stryker-mutator/api/core'; describe(buildMainInjector.name, () => { let testFrameworkOrchestratorMock: sinon.SinonStubbedInstance; diff --git a/packages/core/test/unit/initializer/Presets.spec.ts b/packages/core/test/unit/initializer/Presets.spec.ts index a890be2aea..30a052dbfb 100644 --- a/packages/core/test/unit/initializer/Presets.spec.ts +++ b/packages/core/test/unit/initializer/Presets.spec.ts @@ -1,6 +1,7 @@ import { expect } from 'chai'; import * as inquirer from 'inquirer'; import * as sinon from 'sinon'; + import { AngularPreset } from '../../../src/initializer/presets/AngularPreset'; import { ReactPreset } from '../../../src/initializer/presets/ReactPreset'; import { VueJsPreset } from '../../../src/initializer/presets/VueJsPreset'; diff --git a/packages/core/test/unit/initializer/StrykerInitializer.spec.ts b/packages/core/test/unit/initializer/StrykerInitializer.spec.ts index 10ff046adc..8b3d6490d4 100644 --- a/packages/core/test/unit/initializer/StrykerInitializer.spec.ts +++ b/packages/core/test/unit/initializer/StrykerInitializer.spec.ts @@ -1,10 +1,12 @@ +import * as child from 'child_process'; + import { testInjector } from '@stryker-mutator/test-helpers'; import { childProcessAsPromised, fsAsPromised, normalizeWhitespaces } from '@stryker-mutator/util'; import { expect } from 'chai'; -import * as child from 'child_process'; import * as inquirer from 'inquirer'; import * as sinon from 'sinon'; import { RestClient } from 'typed-rest-client/RestClient'; + import { initializerTokens } from '../../../src/initializer'; import NpmClient from '../../../src/initializer/NpmClient'; import { PackageInfo } from '../../../src/initializer/PackageInfo'; diff --git a/packages/core/test/unit/input/InputFileResolver.spec.ts b/packages/core/test/unit/input/InputFileResolver.spec.ts index 5c24bbdd8c..8bde8aa599 100644 --- a/packages/core/test/unit/input/InputFileResolver.spec.ts +++ b/packages/core/test/unit/input/InputFileResolver.spec.ts @@ -1,3 +1,6 @@ +import * as os from 'os'; +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { File } from '@stryker-mutator/api/core'; import { SourceFile } from '@stryker-mutator/api/report'; @@ -5,9 +8,8 @@ import { testInjector } from '@stryker-mutator/test-helpers'; import { createIsDirError, fileNotFoundError } from '@stryker-mutator/test-helpers/src/factory'; import { childProcessAsPromised, errorToString, fsAsPromised } from '@stryker-mutator/util'; import { expect } from 'chai'; -import os = require('os'); -import * as path from 'path'; import * as sinon from 'sinon'; + import { coreTokens } from '../../../src/di'; import InputFileResolver from '../../../src/input/InputFileResolver'; import BroadcastReporter from '../../../src/reporters/BroadcastReporter'; diff --git a/packages/core/test/unit/logging/LogConfigurator.spec.ts b/packages/core/test/unit/logging/LogConfigurator.spec.ts index 58c3479a7d..e0ae255667 100644 --- a/packages/core/test/unit/logging/LogConfigurator.spec.ts +++ b/packages/core/test/unit/logging/LogConfigurator.spec.ts @@ -2,6 +2,7 @@ import { LogLevel } from '@stryker-mutator/api/core'; import { expect } from 'chai'; import * as log4js from 'log4js'; import * as sinon from 'sinon'; + import LogConfigurator from '../../../src/logging/LogConfigurator'; import LoggingClientContext from '../../../src/logging/LoggingClientContext'; import * as netUtils from '../../../src/utils/netUtils'; diff --git a/packages/core/test/unit/logging/MultiAppender.spec.ts b/packages/core/test/unit/logging/MultiAppender.spec.ts index 48378053b3..88fe68d5dd 100644 --- a/packages/core/test/unit/logging/MultiAppender.spec.ts +++ b/packages/core/test/unit/logging/MultiAppender.spec.ts @@ -1,5 +1,6 @@ import { expect } from 'chai'; import * as log4js from 'log4js'; + import { configure, RuntimeAppender } from '../../../src/logging/MultiAppender'; describe('MultiAppender', () => { diff --git a/packages/core/test/unit/mutants/MutantTestMatcher.spec.ts b/packages/core/test/unit/mutants/MutantTestMatcher.spec.ts index bd1e59b4a5..9655ad9d8a 100644 --- a/packages/core/test/unit/mutants/MutantTestMatcher.spec.ts +++ b/packages/core/test/unit/mutants/MutantTestMatcher.spec.ts @@ -7,6 +7,7 @@ import { testInjector } from '@stryker-mutator/test-helpers'; import { mutant, testResult } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import { coreTokens } from '../../../src/di'; import InputFileCollection from '../../../src/input/InputFileCollection'; import { MutantTestMatcher } from '../../../src/mutants/MutantTestMatcher'; diff --git a/packages/core/test/unit/mutants/MutatorFacade.spec.ts b/packages/core/test/unit/mutants/MutatorFacade.spec.ts index f2824fcb18..a64a13845a 100644 --- a/packages/core/test/unit/mutants/MutatorFacade.spec.ts +++ b/packages/core/test/unit/mutants/MutatorFacade.spec.ts @@ -4,6 +4,7 @@ import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { file } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import { coreTokens, PluginCreator } from '../../../src/di'; import { MutatorFacade } from '../../../src/mutants/MutatorFacade'; import { Mock } from '../../helpers/producers'; diff --git a/packages/core/test/unit/process/InitialTestExecutor.spec.ts b/packages/core/test/unit/process/InitialTestExecutor.spec.ts index d83fbd9e93..0fd199ccb8 100644 --- a/packages/core/test/unit/process/InitialTestExecutor.spec.ts +++ b/packages/core/test/unit/process/InitialTestExecutor.spec.ts @@ -1,3 +1,5 @@ +import { EOL } from 'os'; + import { File, LogLevel } from '@stryker-mutator/api/core'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { TestFramework } from '@stryker-mutator/api/test_framework'; @@ -6,8 +8,8 @@ import { Transpiler } from '@stryker-mutator/api/transpile'; import { testInjector } from '@stryker-mutator/test-helpers'; import { runResult, testFramework, testResult, transpiler } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; -import { EOL } from 'os'; import * as sinon from 'sinon'; + import { coreTokens } from '../../../src/di'; import InputFileCollection from '../../../src/input/InputFileCollection'; import LoggingClientContext from '../../../src/logging/LoggingClientContext'; diff --git a/packages/core/test/unit/process/MutationTestExecutor.spec.ts b/packages/core/test/unit/process/MutationTestExecutor.spec.ts index 075f299b75..39502ff4eb 100644 --- a/packages/core/test/unit/process/MutationTestExecutor.spec.ts +++ b/packages/core/test/unit/process/MutationTestExecutor.spec.ts @@ -5,6 +5,7 @@ import { expect } from 'chai'; import { of } from 'rxjs'; import { from, Observable } from 'rxjs'; import * as sinon from 'sinon'; + import { coreTokens } from '../../../src/di'; import InputFileCollection from '../../../src/input/InputFileCollection'; import { MutationTestExecutor } from '../../../src/process/MutationTestExecutor'; diff --git a/packages/core/test/unit/reporters/BroadcastReporter.spec.ts b/packages/core/test/unit/reporters/BroadcastReporter.spec.ts index b2a557e661..36600e7666 100644 --- a/packages/core/test/unit/reporters/BroadcastReporter.spec.ts +++ b/packages/core/test/unit/reporters/BroadcastReporter.spec.ts @@ -4,6 +4,7 @@ import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { ALL_REPORTER_EVENTS, scoreResult } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import { coreTokens } from '../../../src/di'; import { PluginCreator } from '../../../src/di/PluginCreator'; import BroadcastReporter from '../../../src/reporters/BroadcastReporter'; diff --git a/packages/core/test/unit/reporters/ClearTextReporter.spec.ts b/packages/core/test/unit/reporters/ClearTextReporter.spec.ts index 2df41d3b84..28dc8a8709 100644 --- a/packages/core/test/unit/reporters/ClearTextReporter.spec.ts +++ b/packages/core/test/unit/reporters/ClearTextReporter.spec.ts @@ -1,10 +1,12 @@ +import * as os from 'os'; + import { MutantResult, MutantStatus, mutationTestReportSchema } from '@stryker-mutator/api/report'; import { testInjector } from '@stryker-mutator/test-helpers'; import { mutantResult, mutationScoreThresholds } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; import chalk from 'chalk'; -import * as os from 'os'; import * as sinon from 'sinon'; + import ClearTextReporter from '../../../src/reporters/ClearTextReporter'; const colorizeFileAndPosition = (sourceFilePath: string, line: number, column: number) => { diff --git a/packages/core/test/unit/reporters/ClearTextScoreTable.spec.ts b/packages/core/test/unit/reporters/ClearTextScoreTable.spec.ts index cf36c8d67c..0e82d60b48 100644 --- a/packages/core/test/unit/reporters/ClearTextScoreTable.spec.ts +++ b/packages/core/test/unit/reporters/ClearTextScoreTable.spec.ts @@ -1,11 +1,14 @@ +import * as os from 'os'; + import { MutationScoreThresholds } from '@stryker-mutator/api/core'; import { testInjector } from '@stryker-mutator/test-helpers'; import { metrics, metricsResult } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; import chalk from 'chalk'; -import flatMap = require('lodash.flatmap'); import { MetricsResult } from 'mutation-testing-metrics'; -import * as os from 'os'; + +import flatMap = require('lodash.flatmap'); + import ClearTextScoreTable from '../../../src/reporters/ClearTextScoreTable'; describe(ClearTextScoreTable.name, () => { diff --git a/packages/core/test/unit/reporters/DotsReporter.spec.ts b/packages/core/test/unit/reporters/DotsReporter.spec.ts index 930aaa1705..f66bf52b39 100644 --- a/packages/core/test/unit/reporters/DotsReporter.spec.ts +++ b/packages/core/test/unit/reporters/DotsReporter.spec.ts @@ -1,9 +1,11 @@ +import * as os from 'os'; + import { MutantResult, MutantStatus } from '@stryker-mutator/api/report'; import { factory } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import chalk from 'chalk'; -import * as os from 'os'; import * as sinon from 'sinon'; + import DotsReporter from '../../../src/reporters/DotsReporter'; describe('DotsReporter', () => { diff --git a/packages/core/test/unit/reporters/EventRecorderReporter.spec.ts b/packages/core/test/unit/reporters/EventRecorderReporter.spec.ts index 21e9e9dfd2..c31f0f33b3 100644 --- a/packages/core/test/unit/reporters/EventRecorderReporter.spec.ts +++ b/packages/core/test/unit/reporters/EventRecorderReporter.spec.ts @@ -4,6 +4,7 @@ import { ALL_REPORTER_EVENTS } from '@stryker-mutator/test-helpers/src/factory'; import { fsAsPromised } from '@stryker-mutator/util'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import EventRecorderReporter from '../../../src/reporters/EventRecorderReporter'; import StrictReporter from '../../../src/reporters/StrictReporter'; import * as fileUtils from '../../../src/utils/fileUtils'; diff --git a/packages/core/test/unit/reporters/MutationTestReportCalculator.spec.ts b/packages/core/test/unit/reporters/MutationTestReportCalculator.spec.ts index 93706a26f6..b76f3288c3 100644 --- a/packages/core/test/unit/reporters/MutationTestReportCalculator.spec.ts +++ b/packages/core/test/unit/reporters/MutationTestReportCalculator.spec.ts @@ -2,6 +2,7 @@ import { File } from '@stryker-mutator/api/core'; import { MutantResult, MutantStatus, mutationTestReportSchema, Reporter } from '@stryker-mutator/api/report'; import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; + import { coreTokens } from '../../../src/di'; import InputFileCollection from '../../../src/input/InputFileCollection'; import { MutationTestReportCalculator } from '../../../src/reporters/MutationTestReportCalculator'; diff --git a/packages/core/test/unit/reporters/ProgressAppendOnlyReporter.spec.ts b/packages/core/test/unit/reporters/ProgressAppendOnlyReporter.spec.ts index a0f9c62dcf..8dbc023352 100644 --- a/packages/core/test/unit/reporters/ProgressAppendOnlyReporter.spec.ts +++ b/packages/core/test/unit/reporters/ProgressAppendOnlyReporter.spec.ts @@ -1,8 +1,10 @@ +import * as os from 'os'; + import { MutantStatus } from '@stryker-mutator/api/report'; import { matchedMutant, mutantResult } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; -import * as os from 'os'; import * as sinon from 'sinon'; + import ProgressAppendOnlyReporter from '../../../src/reporters/ProgressAppendOnlyReporter'; const SECOND = 1000; diff --git a/packages/core/test/unit/reporters/ProgressReporter.spec.ts b/packages/core/test/unit/reporters/ProgressReporter.spec.ts index d3a4889d2a..a0bc560367 100644 --- a/packages/core/test/unit/reporters/ProgressReporter.spec.ts +++ b/packages/core/test/unit/reporters/ProgressReporter.spec.ts @@ -1,8 +1,10 @@ import { MatchedMutant, MutantStatus } from '@stryker-mutator/api/report'; import { matchedMutant, mutantResult } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; -import ProgressBar = require('progress'); import * as sinon from 'sinon'; + +import ProgressBar = require('progress'); + import * as progressBarModule from '../../../src/reporters/ProgressBar'; import ProgressReporter from '../../../src/reporters/ProgressReporter'; import { Mock, mock } from '../../helpers/producers'; diff --git a/packages/core/test/unit/reporters/ci/CircleProvider.spec.ts b/packages/core/test/unit/reporters/ci/CircleProvider.spec.ts index 6b9b1830d4..62816a0667 100644 --- a/packages/core/test/unit/reporters/ci/CircleProvider.spec.ts +++ b/packages/core/test/unit/reporters/ci/CircleProvider.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as environmentVariables from '../../../../src/utils/objectUtils'; +import * as environmentVariables from '../../../../src/utils/objectUtils'; import CircleProvider from '../../../../src/reporters/ci/CircleProvider'; describe('CircleCI Provider', () => { diff --git a/packages/core/test/unit/reporters/ci/Provider.spec.ts b/packages/core/test/unit/reporters/ci/Provider.spec.ts index 922505453a..bd61eb6028 100644 --- a/packages/core/test/unit/reporters/ci/Provider.spec.ts +++ b/packages/core/test/unit/reporters/ci/Provider.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as environmentVariables from '../../../../src/utils/objectUtils'; +import * as environmentVariables from '../../../../src/utils/objectUtils'; import { determineCIProvider } from '../../../../src/reporters/ci/Provider'; describe('determineCiProvider()', () => { diff --git a/packages/core/test/unit/reporters/ci/TravisProvider.spec.ts b/packages/core/test/unit/reporters/ci/TravisProvider.spec.ts index cf67b6111a..c36de37549 100644 --- a/packages/core/test/unit/reporters/ci/TravisProvider.spec.ts +++ b/packages/core/test/unit/reporters/ci/TravisProvider.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as environmentVariables from '../../../../src/utils/objectUtils'; +import * as environmentVariables from '../../../../src/utils/objectUtils'; import TravisProvider from '../../../../src/reporters/ci/TravisProvider'; describe('Travis Provider', () => { diff --git a/packages/core/test/unit/reporters/dashboard-reporter/DashboardReporter.spec.ts b/packages/core/test/unit/reporters/dashboard-reporter/DashboardReporter.spec.ts index 9c5a2d619c..2ea59ed44f 100644 --- a/packages/core/test/unit/reporters/dashboard-reporter/DashboardReporter.spec.ts +++ b/packages/core/test/unit/reporters/dashboard-reporter/DashboardReporter.spec.ts @@ -3,6 +3,7 @@ import { testInjector } from '@stryker-mutator/test-helpers'; import { mutationScoreThresholds } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import * as ciProvider from '../../../../src/reporters/ci/Provider'; import DashboardReporter from '../../../../src/reporters/dashboard-reporter/DashboardReporter'; import { diff --git a/packages/core/test/unit/reporters/dashboard-reporter/DashboardReporterClient.spec.ts b/packages/core/test/unit/reporters/dashboard-reporter/DashboardReporterClient.spec.ts index 0337c13a27..de67af4ba1 100644 --- a/packages/core/test/unit/reporters/dashboard-reporter/DashboardReporterClient.spec.ts +++ b/packages/core/test/unit/reporters/dashboard-reporter/DashboardReporterClient.spec.ts @@ -1,6 +1,7 @@ import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import { HttpClient } from 'typed-rest-client/HttpClient'; + import StrykerDashboardClient, { StrykerDashboardReport } from '../../../../src/reporters/dashboard-reporter/DashboardReporterClient'; import DashboardReporterClient from '../../../../src/reporters/dashboard-reporter/DashboardReporterClient'; import { dashboardReporterTokens } from '../../../../src/reporters/dashboard-reporter/tokens'; diff --git a/packages/core/test/unit/test-runner/ChildProcessTestRunnerDecorator.spec.ts b/packages/core/test/unit/test-runner/ChildProcessTestRunnerDecorator.spec.ts index 755ed5cd68..7623635d82 100644 --- a/packages/core/test/unit/test-runner/ChildProcessTestRunnerDecorator.spec.ts +++ b/packages/core/test/unit/test-runner/ChildProcessTestRunnerDecorator.spec.ts @@ -3,6 +3,7 @@ import { RunOptions } from '@stryker-mutator/api/test_runner'; import { strykerOptions } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import ChildProcessCrashedError from '../../../src/child-proxy/ChildProcessCrashedError'; import ChildProcessProxy from '../../../src/child-proxy/ChildProcessProxy'; import LoggingClientContext from '../../../src/logging/LoggingClientContext'; diff --git a/packages/core/test/unit/test-runner/CommandTestRunner.spec.ts b/packages/core/test/unit/test-runner/CommandTestRunner.spec.ts index 11452009eb..b195024ebe 100644 --- a/packages/core/test/unit/test-runner/CommandTestRunner.spec.ts +++ b/packages/core/test/unit/test-runner/CommandTestRunner.spec.ts @@ -1,10 +1,12 @@ +import * as childProcess from 'child_process'; +import * as os from 'os'; + import { Config } from '@stryker-mutator/api/config'; import { RunResult, RunStatus, TestStatus } from '@stryker-mutator/api/test_runner'; import { errorToString } from '@stryker-mutator/util'; import { expect } from 'chai'; -import * as childProcess from 'child_process'; -import * as os from 'os'; import * as sinon from 'sinon'; + import CommandTestRunner, { CommandRunnerSettings } from '../../../src/test-runner/CommandTestRunner'; import * as objectUtils from '../../../src/utils/objectUtils'; import Timer, * as timerModule from '../../../src/utils/Timer'; diff --git a/packages/core/test/unit/test-runner/RetryDecorator.spec.ts b/packages/core/test/unit/test-runner/RetryDecorator.spec.ts index 024614e58a..7b3ce87aab 100644 --- a/packages/core/test/unit/test-runner/RetryDecorator.spec.ts +++ b/packages/core/test/unit/test-runner/RetryDecorator.spec.ts @@ -2,6 +2,7 @@ import { Logger } from '@stryker-mutator/api/logging'; import { RunStatus } from '@stryker-mutator/api/test_runner'; import { errorToString } from '@stryker-mutator/util'; import { expect } from 'chai'; + import ChildProcessCrashedError from '../../../src/child-proxy/ChildProcessCrashedError'; import OutOfMemoryError from '../../../src/child-proxy/OutOfMemoryError'; import RetryDecorator from '../../../src/test-runner/RetryDecorator'; diff --git a/packages/core/test/unit/test-runner/TestRunnerDecorator.spec.ts b/packages/core/test/unit/test-runner/TestRunnerDecorator.spec.ts index abfd27d16a..809409d30e 100644 --- a/packages/core/test/unit/test-runner/TestRunnerDecorator.spec.ts +++ b/packages/core/test/unit/test-runner/TestRunnerDecorator.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import TestRunnerDecorator from '../../../src/test-runner/TestRunnerDecorator'; import TestRunnerMock from '../../helpers/TestRunnerMock'; diff --git a/packages/core/test/unit/test-runner/TimeoutDecorator.spec.ts b/packages/core/test/unit/test-runner/TimeoutDecorator.spec.ts index 49ab4825df..14353f6f8b 100644 --- a/packages/core/test/unit/test-runner/TimeoutDecorator.spec.ts +++ b/packages/core/test/unit/test-runner/TimeoutDecorator.spec.ts @@ -1,6 +1,7 @@ import { RunStatus } from '@stryker-mutator/api/test_runner'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import TimeoutDecorator from '../../../src/test-runner/TimeoutDecorator'; import TestRunnerMock from '../../helpers/TestRunnerMock'; diff --git a/packages/core/test/unit/transpiler/CoverageInstrumenterTranspiler.spec.ts b/packages/core/test/unit/transpiler/CoverageInstrumenterTranspiler.spec.ts index cee341cab5..46e2b34179 100644 --- a/packages/core/test/unit/transpiler/CoverageInstrumenterTranspiler.spec.ts +++ b/packages/core/test/unit/transpiler/CoverageInstrumenterTranspiler.spec.ts @@ -1,6 +1,7 @@ import { Config } from '@stryker-mutator/api/config'; import { File } from '@stryker-mutator/api/core'; import { expect } from 'chai'; + import CoverageInstrumenterTranspiler from '../../../src/transpiler/CoverageInstrumenterTranspiler'; describe('CoverageInstrumenterTranspiler', () => { diff --git a/packages/core/test/unit/transpiler/MutantTranspileScheduler.spec.ts b/packages/core/test/unit/transpiler/MutantTranspileScheduler.spec.ts index 811b619531..7a95f61c14 100644 --- a/packages/core/test/unit/transpiler/MutantTranspileScheduler.spec.ts +++ b/packages/core/test/unit/transpiler/MutantTranspileScheduler.spec.ts @@ -7,6 +7,7 @@ import { expect } from 'chai'; import { range } from 'rxjs'; import { map, toArray } from 'rxjs/operators'; import * as sinon from 'sinon'; + import { coreTokens } from '../../../src/di'; import TranspiledMutant from '../../../src/TranspiledMutant'; import { MutantTranspileScheduler } from '../../../src/transpiler/MutantTranspileScheduler'; diff --git a/packages/core/test/unit/transpiler/SourceMapper.spec.ts b/packages/core/test/unit/transpiler/SourceMapper.spec.ts index f197f12a4a..ec2139713b 100644 --- a/packages/core/test/unit/transpiler/SourceMapper.spec.ts +++ b/packages/core/test/unit/transpiler/SourceMapper.spec.ts @@ -4,6 +4,7 @@ import { config as configFactory, location as locationFactory, PNG_BASE64_ENCODE import { expect } from 'chai'; import * as sinon from 'sinon'; import * as sourceMapModule from 'source-map'; + import SourceMapper, { MappedLocation, PassThroughSourceMapper, SourceMapError, TranspiledSourceMapper } from '../../../src/transpiler/SourceMapper'; import { mappedLocation, Mock, mock } from '../../helpers/producers'; diff --git a/packages/core/test/unit/transpiler/TranspilerFacade.spec.ts b/packages/core/test/unit/transpiler/TranspilerFacade.spec.ts index e2dc7ff04a..62db8d22df 100644 --- a/packages/core/test/unit/transpiler/TranspilerFacade.spec.ts +++ b/packages/core/test/unit/transpiler/TranspilerFacade.spec.ts @@ -4,6 +4,7 @@ import { Transpiler } from '@stryker-mutator/api/transpile'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import { coreTokens } from '../../../src/di'; import { PluginCreator } from '../../../src/di/PluginCreator'; import { TranspilerFacade } from '../../../src/transpiler/TranspilerFacade'; diff --git a/packages/core/test/unit/transpiler/coverageHooks.spec.ts b/packages/core/test/unit/transpiler/coverageHooks.spec.ts index eb160ed920..447019c652 100644 --- a/packages/core/test/unit/transpiler/coverageHooks.spec.ts +++ b/packages/core/test/unit/transpiler/coverageHooks.spec.ts @@ -1,5 +1,6 @@ import { testFramework } from '@stryker-mutator/test-helpers/src/factory'; import { expect } from 'chai'; + import * as coverageHooks from '../../../src/transpiler/coverageHooks'; describe('coveragePerTestHooks', () => { diff --git a/packages/core/test/unit/transpiler/transpiler.spec.ts b/packages/core/test/unit/transpiler/transpiler.spec.ts index 3fc2668aa4..982fcbdc74 100644 --- a/packages/core/test/unit/transpiler/transpiler.spec.ts +++ b/packages/core/test/unit/transpiler/transpiler.spec.ts @@ -4,6 +4,7 @@ import { Transpiler } from '@stryker-mutator/api/transpile'; import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import { transpilerFactory } from '../../../src/transpiler'; import { ChildProcessTranspiler } from '../../../src/transpiler/ChildProcessTranspiler'; diff --git a/packages/core/test/unit/utils/StringBuilder.spec.ts b/packages/core/test/unit/utils/StringBuilder.spec.ts index 959191841e..fbefc4dac1 100644 --- a/packages/core/test/unit/utils/StringBuilder.spec.ts +++ b/packages/core/test/unit/utils/StringBuilder.spec.ts @@ -1,5 +1,7 @@ -import { expect } from 'chai'; import { EOL } from 'os'; + +import { expect } from 'chai'; + import StringBuilder from '../../../src/utils/StringBuilder'; describe(StringBuilder.name, () => { diff --git a/packages/core/test/unit/utils/TemporaryDirectory.spec.ts b/packages/core/test/unit/utils/TemporaryDirectory.spec.ts index c82d45e389..d3b342f811 100644 --- a/packages/core/test/unit/utils/TemporaryDirectory.spec.ts +++ b/packages/core/test/unit/utils/TemporaryDirectory.spec.ts @@ -1,10 +1,12 @@ +import * as path from 'path'; + import { commonTokens } from '@stryker-mutator/api/plugin'; import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { fsAsPromised } from '@stryker-mutator/util'; import { expect } from 'chai'; import * as mkdirp from 'mkdirp'; -import * as path from 'path'; import * as sinon from 'sinon'; + import * as fileUtils from '../../../src/utils/fileUtils'; import { TemporaryDirectory } from '../../../src/utils/TemporaryDirectory'; diff --git a/packages/core/test/unit/utils/Timer.spec.ts b/packages/core/test/unit/utils/Timer.spec.ts index d39b4482e8..a80b92944b 100644 --- a/packages/core/test/unit/utils/Timer.spec.ts +++ b/packages/core/test/unit/utils/Timer.spec.ts @@ -1,5 +1,6 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; + import Timer from '../../../src/utils/Timer'; describe('Timer', () => { diff --git a/packages/core/test/unit/utils/fileUtils.spec.ts b/packages/core/test/unit/utils/fileUtils.spec.ts index 835cca9632..3be997c752 100644 --- a/packages/core/test/unit/utils/fileUtils.spec.ts +++ b/packages/core/test/unit/utils/fileUtils.spec.ts @@ -1,7 +1,9 @@ +import * as path from 'path'; + import { fsAsPromised } from '@stryker-mutator/util'; import { expect } from 'chai'; -import * as path from 'path'; import * as sinon from 'sinon'; + import * as fileUtils from '../../../src/utils/fileUtils'; describe('fileUtils', () => { diff --git a/packages/core/test/unit/utils/objectUtils.spec.ts b/packages/core/test/unit/utils/objectUtils.spec.ts index de022e8955..b19267f9a5 100644 --- a/packages/core/test/unit/utils/objectUtils.spec.ts +++ b/packages/core/test/unit/utils/objectUtils.spec.ts @@ -1,6 +1,7 @@ import { expect } from 'chai'; import { match } from 'sinon'; import * as sinon from 'sinon'; + import * as sut from '../../../src/utils/objectUtils'; import { Task } from '../../../src/utils/Task'; diff --git a/packages/html-reporter/src/HtmlReporter.ts b/packages/html-reporter/src/HtmlReporter.ts index 34a94dd913..a46301dec2 100644 --- a/packages/html-reporter/src/HtmlReporter.ts +++ b/packages/html-reporter/src/HtmlReporter.ts @@ -1,9 +1,12 @@ +import * as path from 'path'; + import { StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { mutationTestReportSchema, Reporter } from '@stryker-mutator/api/report'; + import fileUrl = require('file-url'); -import * as path from 'path'; + import { bindMutationTestReport } from './templates/bindMutationTestReport'; import * as util from './util'; diff --git a/packages/html-reporter/src/index.ts b/packages/html-reporter/src/index.ts index d18fc5854e..d983fb8f2a 100644 --- a/packages/html-reporter/src/index.ts +++ b/packages/html-reporter/src/index.ts @@ -1,4 +1,5 @@ import { declareClassPlugin, PluginKind } from '@stryker-mutator/api/plugin'; + import HtmlReporter from './HtmlReporter'; export const strykerPlugins = [declareClassPlugin(PluginKind.Reporter, 'html', HtmlReporter)]; diff --git a/packages/html-reporter/src/util.ts b/packages/html-reporter/src/util.ts index 62837b9ca1..fc3dbf85af 100644 --- a/packages/html-reporter/src/util.ts +++ b/packages/html-reporter/src/util.ts @@ -1,8 +1,9 @@ +import * as path from 'path'; +import { promisify } from 'util'; + import { fsAsPromised } from '@stryker-mutator/util'; import * as mkdirp from 'mkdirp'; -import * as path from 'path'; import * as rimraf from 'rimraf'; -import { promisify } from 'util'; export function copyFile(fromFilename: string, toFilename: string): Promise { return new Promise((resolve, reject) => { diff --git a/packages/html-reporter/test/integration/MathReport.it.spec.ts b/packages/html-reporter/test/integration/MathReport.it.spec.ts index aaf7f62e85..de6ea80973 100644 --- a/packages/html-reporter/test/integration/MathReport.it.spec.ts +++ b/packages/html-reporter/test/integration/MathReport.it.spec.ts @@ -1,7 +1,10 @@ +import * as fs from 'fs'; + import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as fs from 'fs'; + import HtmlReporter from '../../src/HtmlReporter'; + import { simpleReport } from './simpleReport'; describe('HtmlReporter with example math project', () => { diff --git a/packages/html-reporter/test/unit/HtmlReporter.spec.ts b/packages/html-reporter/test/unit/HtmlReporter.spec.ts index 620ae8b900..6d761db0bd 100644 --- a/packages/html-reporter/test/unit/HtmlReporter.spec.ts +++ b/packages/html-reporter/test/unit/HtmlReporter.spec.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { mutationTestReportSchema } from '@stryker-mutator/api/report'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as path from 'path'; import * as sinon from 'sinon'; + import HtmlReporter from '../../src/HtmlReporter'; import { bindMutationTestReport } from '../../src/templates/bindMutationTestReport'; import * as util from '../../src/util'; diff --git a/packages/jasmine-framework/src/index.ts b/packages/jasmine-framework/src/index.ts index 0fd4653cce..431f0039dd 100644 --- a/packages/jasmine-framework/src/index.ts +++ b/packages/jasmine-framework/src/index.ts @@ -1,4 +1,5 @@ import { declareClassPlugin, PluginKind } from '@stryker-mutator/api/plugin'; + import JasmineTestFramework from './JasmineTestFramework'; export const strykerPlugins = [declareClassPlugin(PluginKind.TestFramework, 'jasmine', JasmineTestFramework)]; diff --git a/packages/jasmine-framework/test/helpers/initChai.ts b/packages/jasmine-framework/test/helpers/initChai.ts index 0d0431d54a..514154da42 100644 --- a/packages/jasmine-framework/test/helpers/initChai.ts +++ b/packages/jasmine-framework/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/jasmine-framework/test/integration/nestedSuite.it.spec.ts b/packages/jasmine-framework/test/integration/nestedSuite.it.spec.ts index 0630aadd49..e882994cbb 100644 --- a/packages/jasmine-framework/test/integration/nestedSuite.it.spec.ts +++ b/packages/jasmine-framework/test/integration/nestedSuite.it.spec.ts @@ -1,9 +1,11 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { TestSelection } from '@stryker-mutator/api/test_framework'; import { expect } from 'chai'; import * as execa from 'execa'; -import * as fs from 'fs'; -import * as path from 'path'; import * as rimraf from 'rimraf'; + import JasmineTestFramework from '../../src/JasmineTestFramework'; interface JasmineTest { diff --git a/packages/jasmine-framework/test/unit/JasmineTestFramework.spec.ts b/packages/jasmine-framework/test/unit/JasmineTestFramework.spec.ts index 7f4085c774..6a4c794e67 100644 --- a/packages/jasmine-framework/test/unit/JasmineTestFramework.spec.ts +++ b/packages/jasmine-framework/test/unit/JasmineTestFramework.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import JasmineTestFramework from '../../src/JasmineTestFramework'; describe('JasmineTestFramework', () => { diff --git a/packages/jasmine-framework/test/unit/index.spec.ts b/packages/jasmine-framework/test/unit/index.spec.ts index 3478734bc3..497f4dccdf 100644 --- a/packages/jasmine-framework/test/unit/index.spec.ts +++ b/packages/jasmine-framework/test/unit/index.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import { strykerPlugins } from '../..'; import JasmineTestFramework from '../../src/JasmineTestFramework'; diff --git a/packages/jasmine-runner/src/JasmineTestRunner.ts b/packages/jasmine-runner/src/JasmineTestRunner.ts index 7441df2ba2..687c7cbac3 100644 --- a/packages/jasmine-runner/src/JasmineTestRunner.ts +++ b/packages/jasmine-runner/src/JasmineTestRunner.ts @@ -1,8 +1,10 @@ +import { EOL } from 'os'; + import { StrykerOptions } from '@stryker-mutator/api/core'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { RunResult, RunStatus, TestResult, TestRunner } from '@stryker-mutator/api/test_runner'; import { errorToString } from '@stryker-mutator/util'; -import { EOL } from 'os'; + import { evalGlobal, Jasmine, toStrykerTestResult } from './helpers'; export default class JasmineTestRunner implements TestRunner { diff --git a/packages/jasmine-runner/src/helpers.ts b/packages/jasmine-runner/src/helpers.ts index eda5871052..9a5ea3e1a1 100644 --- a/packages/jasmine-runner/src/helpers.ts +++ b/packages/jasmine-runner/src/helpers.ts @@ -1,4 +1,5 @@ import { TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; + import JasmineConstructor = require('jasmine'); export function toStrykerTestResult(specResult: jasmine.CustomReporterResult, timeSpentMs: number): TestResult { diff --git a/packages/jasmine-runner/src/index.ts b/packages/jasmine-runner/src/index.ts index 1d5562f3e4..b4f2c91d8e 100644 --- a/packages/jasmine-runner/src/index.ts +++ b/packages/jasmine-runner/src/index.ts @@ -1,4 +1,5 @@ import { declareClassPlugin, PluginKind } from '@stryker-mutator/api/plugin'; + import JasmineTestRunner from './JasmineTestRunner'; export const strykerPlugins = [declareClassPlugin(PluginKind.TestRunner, 'jasmine', JasmineTestRunner)]; diff --git a/packages/jasmine-runner/test/helpers/initChai.ts b/packages/jasmine-runner/test/helpers/initChai.ts index 0d0431d54a..514154da42 100644 --- a/packages/jasmine-runner/test/helpers/initChai.ts +++ b/packages/jasmine-runner/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/jasmine-runner/test/integration/JasmineRunner.it.spec.ts b/packages/jasmine-runner/test/integration/JasmineRunner.it.spec.ts index 22c5541934..884ce2fb3b 100644 --- a/packages/jasmine-runner/test/integration/JasmineRunner.it.spec.ts +++ b/packages/jasmine-runner/test/integration/JasmineRunner.it.spec.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { RunStatus, TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import JasmineTestFramework from '@stryker-mutator/jasmine-framework/src/JasmineTestFramework'; import { factory } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as path from 'path'; + import JasmineTestRunner from '../../src/JasmineTestRunner'; import { expectTestResultsToEqual } from '../helpers/assertions'; diff --git a/packages/jasmine-runner/test/unit/JasmineTestRunner.spec.ts b/packages/jasmine-runner/test/unit/JasmineTestRunner.spec.ts index 9ae1211ee9..8921de8ade 100644 --- a/packages/jasmine-runner/test/unit/JasmineTestRunner.spec.ts +++ b/packages/jasmine-runner/test/unit/JasmineTestRunner.spec.ts @@ -1,8 +1,10 @@ import { RunStatus, TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import { factory } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import Jasmine = require('jasmine'); import * as sinon from 'sinon'; + +import Jasmine = require('jasmine'); + import * as helpers from '../../src/helpers'; import JasmineTestRunner from '../../src/JasmineTestRunner'; import { expectTestResultsToEqual } from '../helpers/assertions'; diff --git a/packages/javascript-mutator/src/JavaScriptMutator.ts b/packages/javascript-mutator/src/JavaScriptMutator.ts index c3c8a3bd06..d4f9fbdabc 100644 --- a/packages/javascript-mutator/src/JavaScriptMutator.ts +++ b/packages/javascript-mutator/src/JavaScriptMutator.ts @@ -3,10 +3,12 @@ import { File } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { Mutant, Mutator } from '@stryker-mutator/api/mutant'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; + import BabelParser from './helpers/BabelParser'; import copy from './helpers/copy'; import { NodeMutator } from './mutators/NodeMutator'; import { NODE_MUTATORS_TOKEN, PARSER_TOKEN } from './helpers/tokens'; + export class JavaScriptMutator implements Mutator { public static inject = tokens(commonTokens.logger, NODE_MUTATORS_TOKEN, PARSER_TOKEN); constructor(private readonly log: Logger, private readonly mutators: readonly NodeMutator[], private readonly parser: BabelParser) {} diff --git a/packages/javascript-mutator/src/helpers/BabelParser.ts b/packages/javascript-mutator/src/helpers/BabelParser.ts index 6987df7ca0..4164772a7b 100644 --- a/packages/javascript-mutator/src/helpers/BabelParser.ts +++ b/packages/javascript-mutator/src/helpers/BabelParser.ts @@ -2,11 +2,12 @@ import generate from '@babel/generator'; import { parse, ParserOptions } from '@babel/parser'; import traverse, { NodePath } from '@babel/traverse'; import * as types from '@babel/types'; -import { NodeWithParent } from './ParentNode'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { MutatorDescriptor } from '@stryker-mutator/api/core'; +import { NodeWithParent } from './ParentNode'; + export default class BabelParser { public static inject = tokens(commonTokens.logger, commonTokens.mutatorDescriptor); private readonly options: ParserOptions; diff --git a/packages/javascript-mutator/src/index.ts b/packages/javascript-mutator/src/index.ts index 614c7a5d66..18ca5a4e7a 100644 --- a/packages/javascript-mutator/src/index.ts +++ b/packages/javascript-mutator/src/index.ts @@ -1,4 +1,5 @@ import { commonTokens, declareFactoryPlugin, Injector, OptionsContext, PluginKind, tokens } from '@stryker-mutator/api/plugin'; + import { JavaScriptMutator } from './JavaScriptMutator'; import { nodeMutators } from './mutators'; import { NODE_MUTATORS_TOKEN, PARSER_TOKEN } from './helpers/tokens'; diff --git a/packages/javascript-mutator/src/mutators/ArrayLiteralMutator.ts b/packages/javascript-mutator/src/mutators/ArrayLiteralMutator.ts index 192cde7658..8a2d3800b5 100644 --- a/packages/javascript-mutator/src/mutators/ArrayLiteralMutator.ts +++ b/packages/javascript-mutator/src/mutators/ArrayLiteralMutator.ts @@ -1,4 +1,5 @@ import * as types from '@babel/types'; + import { NodeMutator } from './NodeMutator'; /** diff --git a/packages/javascript-mutator/src/mutators/ArrayNewExpressionMutator.ts b/packages/javascript-mutator/src/mutators/ArrayNewExpressionMutator.ts index 3474ef2aba..77ee4ec48d 100644 --- a/packages/javascript-mutator/src/mutators/ArrayNewExpressionMutator.ts +++ b/packages/javascript-mutator/src/mutators/ArrayNewExpressionMutator.ts @@ -1,4 +1,5 @@ import * as types from '@babel/types'; + import { NodeMutator } from './NodeMutator'; /** diff --git a/packages/javascript-mutator/src/mutators/BinaryExpressionMutator.ts b/packages/javascript-mutator/src/mutators/BinaryExpressionMutator.ts index 0ff5ed41b1..56e05a5f01 100644 --- a/packages/javascript-mutator/src/mutators/BinaryExpressionMutator.ts +++ b/packages/javascript-mutator/src/mutators/BinaryExpressionMutator.ts @@ -1,4 +1,5 @@ import * as types from '@babel/types'; + import { NodeMutator } from './NodeMutator'; export default class BinaryExpressionMutator implements NodeMutator { diff --git a/packages/javascript-mutator/src/mutators/BlockMutator.ts b/packages/javascript-mutator/src/mutators/BlockMutator.ts index 8ef6954214..cd8d6e6bd1 100644 --- a/packages/javascript-mutator/src/mutators/BlockMutator.ts +++ b/packages/javascript-mutator/src/mutators/BlockMutator.ts @@ -1,4 +1,5 @@ import * as types from '@babel/types'; + import { NodeMutator } from './NodeMutator'; /** diff --git a/packages/javascript-mutator/src/mutators/BooleanSubstitutionMutator.ts b/packages/javascript-mutator/src/mutators/BooleanSubstitutionMutator.ts index 190105c276..eae20db32e 100644 --- a/packages/javascript-mutator/src/mutators/BooleanSubstitutionMutator.ts +++ b/packages/javascript-mutator/src/mutators/BooleanSubstitutionMutator.ts @@ -1,4 +1,5 @@ import * as types from '@babel/types'; + import { NodeMutator } from './NodeMutator'; export default class BooleanSubstitutionMutator implements NodeMutator { diff --git a/packages/javascript-mutator/src/mutators/ConditionalExpressionMutator.ts b/packages/javascript-mutator/src/mutators/ConditionalExpressionMutator.ts index c5a220dc7a..7d972e61ef 100644 --- a/packages/javascript-mutator/src/mutators/ConditionalExpressionMutator.ts +++ b/packages/javascript-mutator/src/mutators/ConditionalExpressionMutator.ts @@ -1,6 +1,8 @@ import * as types from '@babel/types'; + import { NodeGenerator } from '../helpers/NodeGenerator'; import { NodeWithParent } from '../helpers/ParentNode'; + import { NodeMutator } from './NodeMutator'; /** diff --git a/packages/javascript-mutator/src/mutators/DoStatementMutator.ts b/packages/javascript-mutator/src/mutators/DoStatementMutator.ts index 40e9f77f6e..2ab04353e4 100644 --- a/packages/javascript-mutator/src/mutators/DoStatementMutator.ts +++ b/packages/javascript-mutator/src/mutators/DoStatementMutator.ts @@ -1,5 +1,7 @@ import * as types from '@babel/types'; + import { NodeGenerator } from '../helpers/NodeGenerator'; + import { NodeMutator } from './NodeMutator'; /** diff --git a/packages/javascript-mutator/src/mutators/ForStatementMutator.ts b/packages/javascript-mutator/src/mutators/ForStatementMutator.ts index 3ff84878f4..851ed3e88a 100644 --- a/packages/javascript-mutator/src/mutators/ForStatementMutator.ts +++ b/packages/javascript-mutator/src/mutators/ForStatementMutator.ts @@ -1,5 +1,7 @@ import * as types from '@babel/types'; + import { NodeGenerator } from '../helpers/NodeGenerator'; + import { NodeMutator } from './NodeMutator'; /** diff --git a/packages/javascript-mutator/src/mutators/IfStatementMutator.ts b/packages/javascript-mutator/src/mutators/IfStatementMutator.ts index cb7e151589..41203acb4c 100644 --- a/packages/javascript-mutator/src/mutators/IfStatementMutator.ts +++ b/packages/javascript-mutator/src/mutators/IfStatementMutator.ts @@ -1,5 +1,7 @@ import * as types from '@babel/types'; + import { NodeGenerator } from '../helpers/NodeGenerator'; + import { NodeMutator } from './NodeMutator'; /** diff --git a/packages/javascript-mutator/src/mutators/NodeMutator.ts b/packages/javascript-mutator/src/mutators/NodeMutator.ts index 2afca32add..b5a983ed28 100644 --- a/packages/javascript-mutator/src/mutators/NodeMutator.ts +++ b/packages/javascript-mutator/src/mutators/NodeMutator.ts @@ -1,4 +1,5 @@ import * as types from '@babel/types'; + import { NodeWithParent } from '../helpers/ParentNode'; /** diff --git a/packages/javascript-mutator/src/mutators/ObjectLiteralMutator.ts b/packages/javascript-mutator/src/mutators/ObjectLiteralMutator.ts index 1e23f0e0a0..b34b7fb6f2 100644 --- a/packages/javascript-mutator/src/mutators/ObjectLiteralMutator.ts +++ b/packages/javascript-mutator/src/mutators/ObjectLiteralMutator.ts @@ -1,4 +1,5 @@ import * as types from '@babel/types'; + import { NodeMutator } from './NodeMutator'; /** diff --git a/packages/javascript-mutator/src/mutators/PostfixUnaryExpressionMutator.ts b/packages/javascript-mutator/src/mutators/PostfixUnaryExpressionMutator.ts index ec2465a660..0982112ce0 100644 --- a/packages/javascript-mutator/src/mutators/PostfixUnaryExpressionMutator.ts +++ b/packages/javascript-mutator/src/mutators/PostfixUnaryExpressionMutator.ts @@ -1,4 +1,5 @@ import * as types from '@babel/types'; + import { NodeMutator } from './NodeMutator'; export default class PostfixUnaryExpressionMutator implements NodeMutator { diff --git a/packages/javascript-mutator/src/mutators/PrefixUnaryExpressionMutator.ts b/packages/javascript-mutator/src/mutators/PrefixUnaryExpressionMutator.ts index 659876f879..9e4a9d6d4c 100644 --- a/packages/javascript-mutator/src/mutators/PrefixUnaryExpressionMutator.ts +++ b/packages/javascript-mutator/src/mutators/PrefixUnaryExpressionMutator.ts @@ -1,4 +1,5 @@ import * as types from '@babel/types'; + import { NodeMutator } from './NodeMutator'; export default class PrefixUnaryExpressionMutator implements NodeMutator { diff --git a/packages/javascript-mutator/src/mutators/StringLiteralMutator.ts b/packages/javascript-mutator/src/mutators/StringLiteralMutator.ts index 8dada399b4..01b4493685 100644 --- a/packages/javascript-mutator/src/mutators/StringLiteralMutator.ts +++ b/packages/javascript-mutator/src/mutators/StringLiteralMutator.ts @@ -1,5 +1,7 @@ import * as types from '@babel/types'; + import { NodeWithParent } from '../helpers/ParentNode'; + import { NodeMutator } from './NodeMutator'; export default class StringLiteralMutator implements NodeMutator { diff --git a/packages/javascript-mutator/src/mutators/SwitchCaseMutator.ts b/packages/javascript-mutator/src/mutators/SwitchCaseMutator.ts index 89897fe8f9..5df5361c7a 100644 --- a/packages/javascript-mutator/src/mutators/SwitchCaseMutator.ts +++ b/packages/javascript-mutator/src/mutators/SwitchCaseMutator.ts @@ -1,5 +1,7 @@ import * as types from '@babel/types'; + import { NodeWithParent } from '../helpers/ParentNode'; + import { NodeMutator } from './NodeMutator'; /** diff --git a/packages/javascript-mutator/src/mutators/WhileStatementMutator.ts b/packages/javascript-mutator/src/mutators/WhileStatementMutator.ts index 9047c3e4eb..f19363ade2 100644 --- a/packages/javascript-mutator/src/mutators/WhileStatementMutator.ts +++ b/packages/javascript-mutator/src/mutators/WhileStatementMutator.ts @@ -1,5 +1,7 @@ import * as types from '@babel/types'; + import { NodeGenerator } from '../helpers/NodeGenerator'; + import { NodeMutator } from './NodeMutator'; /** diff --git a/packages/javascript-mutator/test/helpers/initChai.ts b/packages/javascript-mutator/test/helpers/initChai.ts index 0d0431d54a..514154da42 100644 --- a/packages/javascript-mutator/test/helpers/initChai.ts +++ b/packages/javascript-mutator/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/javascript-mutator/test/helpers/mutatorAssertions.ts b/packages/javascript-mutator/test/helpers/mutatorAssertions.ts index 441a357c87..d2f66f302a 100644 --- a/packages/javascript-mutator/test/helpers/mutatorAssertions.ts +++ b/packages/javascript-mutator/test/helpers/mutatorAssertions.ts @@ -3,6 +3,7 @@ import { Mutant } from '@stryker-mutator/api/mutant'; import ExpectMutation from '@stryker-mutator/mutator-specification/src/ExpectMutation'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; + import { JavaScriptMutator } from '../../src/JavaScriptMutator'; import { NodeMutator } from '../../src/mutators/NodeMutator'; import { NODE_MUTATORS_TOKEN, PARSER_TOKEN } from '../../src/helpers/tokens'; diff --git a/packages/javascript-mutator/test/unit/JavaScriptMutator.spec.ts b/packages/javascript-mutator/test/unit/JavaScriptMutator.spec.ts index 5d022adbcb..7c3c9c9b46 100644 --- a/packages/javascript-mutator/test/unit/JavaScriptMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/JavaScriptMutator.spec.ts @@ -1,6 +1,7 @@ import { File } from '@stryker-mutator/api/core'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; + import { JavaScriptMutator } from '../../src/JavaScriptMutator'; import { nodeMutators } from '../../src/mutators'; import { NodeMutator } from '../../src/mutators/NodeMutator'; diff --git a/packages/javascript-mutator/test/unit/helpers/BabelParser.spec.ts b/packages/javascript-mutator/test/unit/helpers/BabelParser.spec.ts index 01640c32cb..21535b0eed 100644 --- a/packages/javascript-mutator/test/unit/helpers/BabelParser.spec.ts +++ b/packages/javascript-mutator/test/unit/helpers/BabelParser.spec.ts @@ -1,7 +1,8 @@ import { expect } from 'chai'; -import BabelParser from '../../../src/helpers/BabelParser'; import { testInjector } from '@stryker-mutator/test-helpers'; +import BabelParser from '../../../src/helpers/BabelParser'; + describe(BabelParser.name, () => { function createSut() { return testInjector.injector.injectClass(BabelParser); diff --git a/packages/javascript-mutator/test/unit/helpers/initSinon.ts b/packages/javascript-mutator/test/unit/helpers/initSinon.ts index e1976b3616..79b73de392 100644 --- a/packages/javascript-mutator/test/unit/helpers/initSinon.ts +++ b/packages/javascript-mutator/test/unit/helpers/initSinon.ts @@ -3,6 +3,7 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinon from 'sinon'; import * as sinonChai from 'sinon-chai'; + chai.use(chaiAsPromised); chai.use(sinonChai); afterEach(() => { diff --git a/packages/javascript-mutator/test/unit/mutators/BinaryExpressionMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/BinaryExpressionMutator.spec.ts index 2cd21db9f4..1b9a8230c3 100644 --- a/packages/javascript-mutator/test/unit/mutators/BinaryExpressionMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/BinaryExpressionMutator.spec.ts @@ -1,4 +1,5 @@ import { BinaryExpressionMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import BinaryExpressionMutator from '../../../src/mutators/BinaryExpressionMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/BlockMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/BlockMutator.spec.ts index f7b418249d..51f7cef689 100644 --- a/packages/javascript-mutator/test/unit/mutators/BlockMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/BlockMutator.spec.ts @@ -1,4 +1,5 @@ import { BlockMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import BlockMutator from '../../../src/mutators/BlockMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/BooleanSubstitutionMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/BooleanSubstitutionMutator.spec.ts index bda58f635d..2eb15fd533 100644 --- a/packages/javascript-mutator/test/unit/mutators/BooleanSubstitutionMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/BooleanSubstitutionMutator.spec.ts @@ -1,4 +1,5 @@ import { BooleanSubstitutionMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import BooleanSubstitutionMutator from '../../../src/mutators/BooleanSubstitutionMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/ConditionalExpressionMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/ConditionalExpressionMutator.spec.ts index 4e3f753600..2a126ed2f3 100644 --- a/packages/javascript-mutator/test/unit/mutators/ConditionalExpressionMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/ConditionalExpressionMutator.spec.ts @@ -1,4 +1,5 @@ import { ConditionalExpressionMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import ConditionalExpressionMutator from '../../../src/mutators/ConditionalExpressionMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/DoMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/DoMutator.spec.ts index ab84999116..cccbdd2e3c 100644 --- a/packages/javascript-mutator/test/unit/mutators/DoMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/DoMutator.spec.ts @@ -1,4 +1,5 @@ import { DoStatementMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import DoStatementMutator from '../../../src/mutators/DoStatementMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/ForStatementMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/ForStatementMutator.spec.ts index 9df65abdbe..f52bcd96c5 100644 --- a/packages/javascript-mutator/test/unit/mutators/ForStatementMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/ForStatementMutator.spec.ts @@ -1,4 +1,5 @@ import { ForStatementMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import ForStatementMutator from '../../../src/mutators/ForStatementMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/IfStatementMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/IfStatementMutator.spec.ts index 6c975b5fe0..abd73f3431 100644 --- a/packages/javascript-mutator/test/unit/mutators/IfStatementMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/IfStatementMutator.spec.ts @@ -1,4 +1,5 @@ import { IfStatementMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import IfStatementMutator from '../../../src/mutators/IfStatementMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/ObjectLiteralMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/ObjectLiteralMutator.spec.ts index e80fb69a84..7c1f36d749 100644 --- a/packages/javascript-mutator/test/unit/mutators/ObjectLiteralMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/ObjectLiteralMutator.spec.ts @@ -1,4 +1,5 @@ import { ObjectLiteralMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import ObjectLiteralMutator from '../../../src/mutators/ObjectLiteralMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/PrefixUnaryMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/PrefixUnaryMutator.spec.ts index baa8141aaa..a1df854a23 100644 --- a/packages/javascript-mutator/test/unit/mutators/PrefixUnaryMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/PrefixUnaryMutator.spec.ts @@ -1,4 +1,5 @@ import { PrefixUnaryExpressionMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import PrefixUnaryExpressionMutator from '../../../src/mutators/PrefixUnaryExpressionMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/StringLiteralMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/StringLiteralMutator.spec.ts index c0d928e15d..3f1a29db54 100644 --- a/packages/javascript-mutator/test/unit/mutators/StringLiteralMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/StringLiteralMutator.spec.ts @@ -1,4 +1,5 @@ import { StringLiteralMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import StringLiteralMutator from '../../../src/mutators/StringLiteralMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/SwitchCaseMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/SwitchCaseMutator.spec.ts index 77c3a617ab..57689bc3fb 100644 --- a/packages/javascript-mutator/test/unit/mutators/SwitchCaseMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/SwitchCaseMutator.spec.ts @@ -1,4 +1,5 @@ import { SwitchCaseMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import SwitchCaseMutator from '../../../src/mutators/SwitchCaseMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/javascript-mutator/test/unit/mutators/WhileStatementMutator.spec.ts b/packages/javascript-mutator/test/unit/mutators/WhileStatementMutator.spec.ts index 9ce5a8c47c..cb7f27d2ee 100644 --- a/packages/javascript-mutator/test/unit/mutators/WhileStatementMutator.spec.ts +++ b/packages/javascript-mutator/test/unit/mutators/WhileStatementMutator.spec.ts @@ -1,4 +1,5 @@ import { WhileStatementMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import WhileStatementMutator from '../../../src/mutators/WhileStatementMutator'; import { verifySpecification } from '../../helpers/mutatorAssertions'; diff --git a/packages/jest-runner/src/JestConfigEditor.ts b/packages/jest-runner/src/JestConfigEditor.ts index 65055944b9..b683b6aa8d 100644 --- a/packages/jest-runner/src/JestConfigEditor.ts +++ b/packages/jest-runner/src/JestConfigEditor.ts @@ -1,5 +1,6 @@ import { Config, ConfigEditor } from '@stryker-mutator/api/config'; import jest from 'jest'; + import CustomJestConfigLoader from './configLoaders/CustomJestConfigLoader'; import JestConfigLoader from './configLoaders/JestConfigLoader'; import ReactScriptsJestConfigLoader from './configLoaders/ReactScriptsJestConfigLoader'; diff --git a/packages/jest-runner/src/JestTestRunner.ts b/packages/jest-runner/src/JestTestRunner.ts index 8f7927a74c..5d710550e9 100644 --- a/packages/jest-runner/src/JestTestRunner.ts +++ b/packages/jest-runner/src/JestTestRunner.ts @@ -3,6 +3,7 @@ import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, Injector, OptionsContext, tokens } from '@stryker-mutator/api/plugin'; import { RunOptions, RunResult, RunStatus, TestResult, TestRunner, TestStatus } from '@stryker-mutator/api/test_runner'; import jest from 'jest'; + import { JEST_VERSION_TOKEN, jestTestAdapterFactory } from './jestTestAdapters'; import JestTestAdapter from './jestTestAdapters/JestTestAdapter'; diff --git a/packages/jest-runner/src/configLoaders/CustomJestConfigLoader.ts b/packages/jest-runner/src/configLoaders/CustomJestConfigLoader.ts index 90ca849d57..115d4d3028 100644 --- a/packages/jest-runner/src/configLoaders/CustomJestConfigLoader.ts +++ b/packages/jest-runner/src/configLoaders/CustomJestConfigLoader.ts @@ -1,6 +1,8 @@ import fs = require('fs'); -import jest from 'jest'; import path from 'path'; + +import jest from 'jest'; + import JestConfigLoader from './JestConfigLoader'; /** diff --git a/packages/jest-runner/src/configLoaders/ReactScriptsJestConfigLoader.ts b/packages/jest-runner/src/configLoaders/ReactScriptsJestConfigLoader.ts index a7de1f5796..79491836c8 100644 --- a/packages/jest-runner/src/configLoaders/ReactScriptsJestConfigLoader.ts +++ b/packages/jest-runner/src/configLoaders/ReactScriptsJestConfigLoader.ts @@ -1,6 +1,9 @@ -import jest from 'jest'; import path from 'path'; + +import jest from 'jest'; + import { createReactJestConfig } from '../utils/createReactJestConfig'; + import JestConfigLoader from './JestConfigLoader'; export default class ReactScriptsJestConfigLoader implements JestConfigLoader { diff --git a/packages/jest-runner/src/configLoaders/ReactScriptsTSJestConfigLoader.ts b/packages/jest-runner/src/configLoaders/ReactScriptsTSJestConfigLoader.ts index 4353c6a4c5..c6c341b96e 100644 --- a/packages/jest-runner/src/configLoaders/ReactScriptsTSJestConfigLoader.ts +++ b/packages/jest-runner/src/configLoaders/ReactScriptsTSJestConfigLoader.ts @@ -1,6 +1,9 @@ -import jest from 'jest'; import * as path from 'path'; + +import jest from 'jest'; + import { createReactTsJestConfig } from '../utils/createReactJestConfig'; + import JestConfigLoader from './JestConfigLoader'; export default class ReactScriptsTSJestConfigLoader implements JestConfigLoader { diff --git a/packages/jest-runner/src/index.ts b/packages/jest-runner/src/index.ts index 9786d5425d..8f75dbbfe6 100644 --- a/packages/jest-runner/src/index.ts +++ b/packages/jest-runner/src/index.ts @@ -1,4 +1,5 @@ import { declareClassPlugin, declareFactoryPlugin, PluginKind } from '@stryker-mutator/api/plugin'; + import JestConfigEditor from './JestConfigEditor'; import { jestTestRunnerFactory } from './JestTestRunner'; diff --git a/packages/jest-runner/src/jestTestAdapters/JestPromiseTestAdapter.ts b/packages/jest-runner/src/jestTestAdapters/JestPromiseTestAdapter.ts index c3bc529b2b..e9da5aac77 100644 --- a/packages/jest-runner/src/jestTestAdapters/JestPromiseTestAdapter.ts +++ b/packages/jest-runner/src/jestTestAdapters/JestPromiseTestAdapter.ts @@ -1,6 +1,7 @@ import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import jest from 'jest'; + import JestTestAdapter from './JestTestAdapter'; export default class JestPromiseTestAdapter implements JestTestAdapter { diff --git a/packages/jest-runner/src/jestTestAdapters/index.ts b/packages/jest-runner/src/jestTestAdapters/index.ts index b7f5d463fb..c49cc627fc 100644 --- a/packages/jest-runner/src/jestTestAdapters/index.ts +++ b/packages/jest-runner/src/jestTestAdapters/index.ts @@ -1,6 +1,7 @@ import { Logger } from '@stryker-mutator/api/logging'; import { BaseContext, commonTokens, Injector, tokens } from '@stryker-mutator/api/plugin'; import semver from 'semver'; + import JestPromiseAdapter from './JestPromiseTestAdapter'; import JestTestAdapter from './JestTestAdapter'; diff --git a/packages/jest-runner/test/helpers/initChai.ts b/packages/jest-runner/test/helpers/initChai.ts index fa9301c153..3707545700 100644 --- a/packages/jest-runner/test/helpers/initChai.ts +++ b/packages/jest-runner/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import chai from 'chai'; import chaiAsPromised from 'chai-as-promised'; import sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/jest-runner/test/integration/JestConfigEditor.it.spec.ts b/packages/jest-runner/test/integration/JestConfigEditor.it.spec.ts index 250cc5403b..32ae020e7d 100644 --- a/packages/jest-runner/test/integration/JestConfigEditor.it.spec.ts +++ b/packages/jest-runner/test/integration/JestConfigEditor.it.spec.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as path from 'path'; import * as sinon from 'sinon'; + import JestConfigEditor from '../../src/JestConfigEditor'; describe('Integration test for Jest ConfigEditor', () => { diff --git a/packages/jest-runner/test/integration/StrykerJestRunner.it.spec.ts b/packages/jest-runner/test/integration/StrykerJestRunner.it.spec.ts index 09c42f5369..e28376dd62 100644 --- a/packages/jest-runner/test/integration/StrykerJestRunner.it.spec.ts +++ b/packages/jest-runner/test/integration/StrykerJestRunner.it.spec.ts @@ -1,17 +1,18 @@ -import { RunOptions, RunStatus, TestStatus } from '@stryker-mutator/api/test_runner'; -import { expect } from 'chai'; import * as path from 'path'; -import * as sinon from 'sinon'; - -// It's a bit hacky, but we need to tell create-react-app-ts to pick a different tsconfig.test.json -const paths = require('react-scripts-ts/config/paths'); -paths.appTsTestConfig = require.resolve('../../testResources/reactTsProject/tsconfig.test.json'); +import { expect } from 'chai'; +import { RunOptions, RunStatus, TestStatus } from '@stryker-mutator/api/test_runner'; +import * as sinon from 'sinon'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { factory, testInjector } from '@stryker-mutator/test-helpers'; + import JestConfigEditor from '../../src/JestConfigEditor'; import { jestTestRunnerFactory } from '../../src/JestTestRunner'; +const paths = require('react-scripts-ts/config/paths'); +// It's a bit hacky, but we need to tell create-react-app-ts to pick a different tsconfig.test.json +paths.appTsTestConfig = require.resolve('../../testResources/reactTsProject/tsconfig.test.json'); + // Get the actual project root, since we will stub process.cwd later on const jestProjectRoot = process.cwd(); diff --git a/packages/jest-runner/test/unit/JestConfigEditor.spec.ts b/packages/jest-runner/test/unit/JestConfigEditor.spec.ts index d7662b8f94..eb219866a8 100644 --- a/packages/jest-runner/test/unit/JestConfigEditor.spec.ts +++ b/packages/jest-runner/test/unit/JestConfigEditor.spec.ts @@ -3,6 +3,7 @@ import { testInjector } from '@stryker-mutator/test-helpers'; import { assert, expect } from 'chai'; import jest from 'jest'; import * as sinon from 'sinon'; + import CustomJestConfigLoader, * as defaultJestConfigLoader from '../../src/configLoaders/CustomJestConfigLoader'; import ReactScriptsJestConfigLoader, * as reactScriptsJestConfigLoader from '../../src/configLoaders/ReactScriptsJestConfigLoader'; import ReactScriptsTSJestConfigLoader, * as reactScriptsTSJestConfigLoader from '../../src/configLoaders/ReactScriptsTSJestConfigLoader'; diff --git a/packages/jest-runner/test/unit/JestTestRunner.spec.ts b/packages/jest-runner/test/unit/JestTestRunner.spec.ts index 3c7b20d0b8..683a1ccd48 100644 --- a/packages/jest-runner/test/unit/JestTestRunner.spec.ts +++ b/packages/jest-runner/test/unit/JestTestRunner.spec.ts @@ -2,6 +2,7 @@ import { RunOptions, RunStatus, TestStatus } from '@stryker-mutator/api/test_run import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import sinon from 'sinon'; + import { JestTestAdapter } from '../../src/jestTestAdapters'; import JestTestRunner, { JEST_TEST_ADAPTER_TOKEN, PROCESS_ENV_TOKEN } from '../../src/JestTestRunner'; import * as fakeResults from '../helpers/testResultProducer'; diff --git a/packages/jest-runner/test/unit/configLoaders/CustomConfigLoader.spec.ts b/packages/jest-runner/test/unit/configLoaders/CustomConfigLoader.spec.ts index 33b69cccc0..56e54f91ae 100644 --- a/packages/jest-runner/test/unit/configLoaders/CustomConfigLoader.spec.ts +++ b/packages/jest-runner/test/unit/configLoaders/CustomConfigLoader.spec.ts @@ -1,7 +1,9 @@ -import { assert, expect } from 'chai'; import fs from 'fs'; import path from 'path'; + +import { assert, expect } from 'chai'; import sinon from 'sinon'; + import CustomJestConfigLoader from '../../../src/configLoaders/CustomJestConfigLoader'; describe(CustomJestConfigLoader.name, () => { diff --git a/packages/jest-runner/test/unit/configLoaders/DefaultConfigLoader.spec.ts b/packages/jest-runner/test/unit/configLoaders/DefaultConfigLoader.spec.ts index 06aaa3acd4..bb3140f602 100644 --- a/packages/jest-runner/test/unit/configLoaders/DefaultConfigLoader.spec.ts +++ b/packages/jest-runner/test/unit/configLoaders/DefaultConfigLoader.spec.ts @@ -1,7 +1,9 @@ -import { assert, expect } from 'chai'; import fs from 'fs'; import path from 'path'; + +import { assert, expect } from 'chai'; import sinon from 'sinon'; + import CustomJestConfigLoader from '../../../src/configLoaders/CustomJestConfigLoader'; describe(`${CustomJestConfigLoader.name} integration`, () => { diff --git a/packages/jest-runner/test/unit/configLoaders/ReactScriptsJestConfigLoader.spec.ts b/packages/jest-runner/test/unit/configLoaders/ReactScriptsJestConfigLoader.spec.ts index 1e57f1f8f3..f3185d1476 100644 --- a/packages/jest-runner/test/unit/configLoaders/ReactScriptsJestConfigLoader.spec.ts +++ b/packages/jest-runner/test/unit/configLoaders/ReactScriptsJestConfigLoader.spec.ts @@ -1,6 +1,8 @@ -import { expect } from 'chai'; import path from 'path'; + +import { expect } from 'chai'; import sinon from 'sinon'; + import ReactScriptsJestConfigLoader from '../../../src/configLoaders/ReactScriptsJestConfigLoader'; import * as helper from '../../../src/utils/createReactJestConfig'; diff --git a/packages/jest-runner/test/unit/configLoaders/ReactScriptsTsJestConfigLoader.spec.ts b/packages/jest-runner/test/unit/configLoaders/ReactScriptsTsJestConfigLoader.spec.ts index 0362c7b7bb..aaa21e4444 100644 --- a/packages/jest-runner/test/unit/configLoaders/ReactScriptsTsJestConfigLoader.spec.ts +++ b/packages/jest-runner/test/unit/configLoaders/ReactScriptsTsJestConfigLoader.spec.ts @@ -1,6 +1,8 @@ -import { assert, expect } from 'chai'; import path from 'path'; + +import { assert, expect } from 'chai'; import sinon from 'sinon'; + import ReactScriptsTSJestConfigLoader from '../../../src/configLoaders/ReactScriptsTSJestConfigLoader'; import * as helper from '../../../src/utils/createReactJestConfig'; diff --git a/packages/jest-runner/test/unit/jestTestAdapters/JestPromiseTestAdapter.spec.ts b/packages/jest-runner/test/unit/jestTestAdapters/JestPromiseTestAdapter.spec.ts index e87232907e..993a64f455 100644 --- a/packages/jest-runner/test/unit/jestTestAdapters/JestPromiseTestAdapter.spec.ts +++ b/packages/jest-runner/test/unit/jestTestAdapters/JestPromiseTestAdapter.spec.ts @@ -2,6 +2,7 @@ import { testInjector } from '@stryker-mutator/test-helpers'; import { assert, expect } from 'chai'; import jest from 'jest'; import sinon from 'sinon'; + import JestPromiseTestAdapter from '../../../src/jestTestAdapters/JestPromiseTestAdapter'; describe(JestPromiseTestAdapter.name, () => { diff --git a/packages/jest-runner/test/unit/jestTestAdapters/JestTestAdapterFactory.spec.ts b/packages/jest-runner/test/unit/jestTestAdapters/JestTestAdapterFactory.spec.ts index ca12a588df..1c3116f9a4 100644 --- a/packages/jest-runner/test/unit/jestTestAdapters/JestTestAdapterFactory.spec.ts +++ b/packages/jest-runner/test/unit/jestTestAdapters/JestTestAdapterFactory.spec.ts @@ -1,5 +1,6 @@ import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; + import { JEST_VERSION_TOKEN, JestTestAdapter, jestTestAdapterFactory } from '../../../src/jestTestAdapters'; import JestPromiseTestAdapter from '../../../src/jestTestAdapters/JestPromiseTestAdapter'; diff --git a/packages/jest-runner/test/unit/utils/createReactJestConfig.spec.ts b/packages/jest-runner/test/unit/utils/createReactJestConfig.spec.ts index 9b1a543241..06467264b3 100644 --- a/packages/jest-runner/test/unit/utils/createReactJestConfig.spec.ts +++ b/packages/jest-runner/test/unit/utils/createReactJestConfig.spec.ts @@ -1,5 +1,6 @@ import { assert, expect } from 'chai'; import * as sinon from 'sinon'; + import { createReactJestConfig, createReactTsJestConfig } from '../../../src/utils/createReactJestConfig'; describe('createReactJestConfig', () => { diff --git a/packages/karma-runner/src/KarmaTestRunner.ts b/packages/karma-runner/src/KarmaTestRunner.ts index d359fe7f93..fcb6f50589 100644 --- a/packages/karma-runner/src/KarmaTestRunner.ts +++ b/packages/karma-runner/src/KarmaTestRunner.ts @@ -3,8 +3,9 @@ import { Logger, LoggerFactoryMethod } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { CoverageCollection, CoveragePerTestResult, RunResult, RunStatus, TestResult, TestRunner } from '@stryker-mutator/api/test_runner'; import * as karma from 'karma'; -import ProjectStarter from './starters/ProjectStarter'; + import strykerKarmaConf = require('./starters/stryker-karma.conf'); +import ProjectStarter from './starters/ProjectStarter'; import StrykerKarmaSetup, { KARMA_CONFIG_KEY } from './StrykerKarmaSetup'; import StrykerReporter from './StrykerReporter'; import TestHooksMiddleware from './TestHooksMiddleware'; diff --git a/packages/karma-runner/src/StrykerReporter.ts b/packages/karma-runner/src/StrykerReporter.ts index fc40e89485..d7a9b0e9dd 100644 --- a/packages/karma-runner/src/StrykerReporter.ts +++ b/packages/karma-runner/src/StrykerReporter.ts @@ -1,5 +1,6 @@ -import { CoverageCollection, CoverageCollectionPerTest, RunStatus, TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import { EventEmitter } from 'events'; + +import { CoverageCollection, CoverageCollectionPerTest, RunStatus, TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import * as karma from 'karma'; export interface KarmaSpec { diff --git a/packages/karma-runner/src/TestHooksMiddleware.ts b/packages/karma-runner/src/TestHooksMiddleware.ts index fa9d17a4f4..390baca373 100644 --- a/packages/karma-runner/src/TestHooksMiddleware.ts +++ b/packages/karma-runner/src/TestHooksMiddleware.ts @@ -1,7 +1,8 @@ -import { RequestHandler } from 'express'; import * as path from 'path'; import * as url from 'url'; +import { RequestHandler } from 'express'; + export const TEST_HOOKS_FILE_NAME = require.resolve('./testHooksForStryker'); export default class TestHooksMiddleware { diff --git a/packages/karma-runner/src/index.ts b/packages/karma-runner/src/index.ts index 147aed4869..73578b6c9a 100644 --- a/packages/karma-runner/src/index.ts +++ b/packages/karma-runner/src/index.ts @@ -1,4 +1,5 @@ import { declareClassPlugin, PluginKind } from '@stryker-mutator/api/plugin'; + import KarmaTestRunner from './KarmaTestRunner'; export const strykerPlugins = [declareClassPlugin(PluginKind.TestRunner, 'karma', KarmaTestRunner)]; diff --git a/packages/karma-runner/src/starters/ProjectStarter.ts b/packages/karma-runner/src/starters/ProjectStarter.ts index 0630cc177c..5875b5d132 100644 --- a/packages/karma-runner/src/starters/ProjectStarter.ts +++ b/packages/karma-runner/src/starters/ProjectStarter.ts @@ -1,5 +1,7 @@ import { LoggerFactoryMethod } from '@stryker-mutator/api/logging'; + import StrykerKarmaSetup from '../StrykerKarmaSetup'; + import * as angularStarter from './angularStarter'; import * as karmaStarter from './karmaStarter'; diff --git a/packages/karma-runner/src/starters/angularStarter.ts b/packages/karma-runner/src/starters/angularStarter.ts index 70681e5d89..c871a88f03 100644 --- a/packages/karma-runner/src/starters/angularStarter.ts +++ b/packages/karma-runner/src/starters/angularStarter.ts @@ -1,7 +1,9 @@ +import * as path from 'path'; + import { Logger, LoggerFactoryMethod } from '@stryker-mutator/api/logging'; import decamelize from 'decamelize'; -import * as path from 'path'; import * as semver from 'semver'; + import { NgConfigOptions, NgTestArguments } from '../StrykerKarmaSetup'; import { requireModule } from '../utils'; diff --git a/packages/karma-runner/src/starters/stryker-karma.conf.ts b/packages/karma-runner/src/starters/stryker-karma.conf.ts index 7bc2c92a46..2241a6ea0b 100644 --- a/packages/karma-runner/src/starters/stryker-karma.conf.ts +++ b/packages/karma-runner/src/starters/stryker-karma.conf.ts @@ -1,6 +1,8 @@ +import * as path from 'path'; + import { Logger, LoggerFactoryMethod } from '@stryker-mutator/api/logging'; import { Config, ConfigOptions } from 'karma'; -import * as path from 'path'; + import StrykerReporter from '../StrykerReporter'; import TestHooksMiddleware, { TEST_HOOKS_FILE_NAME } from '../TestHooksMiddleware'; import { requireModule } from '../utils'; diff --git a/packages/karma-runner/test/helpers/initChai.ts b/packages/karma-runner/test/helpers/initChai.ts index 0d0431d54a..514154da42 100644 --- a/packages/karma-runner/test/helpers/initChai.ts +++ b/packages/karma-runner/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/karma-runner/test/integration/KarmaTestRunner.it.spec.ts b/packages/karma-runner/test/integration/KarmaTestRunner.it.spec.ts index 3c3fe2ba2b..ae2ce8bb2e 100644 --- a/packages/karma-runner/test/integration/KarmaTestRunner.it.spec.ts +++ b/packages/karma-runner/test/integration/KarmaTestRunner.it.spec.ts @@ -1,10 +1,12 @@ +import { promisify } from 'util'; +import * as http from 'http'; + import { CoverageCollection, RunResult, RunStatus, TestStatus } from '@stryker-mutator/api/test_runner'; import JasmineTestFramework from '@stryker-mutator/jasmine-framework/src/JasmineTestFramework'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import http = require('http'); import { FilePattern } from 'karma'; -import { promisify } from 'util'; + import KarmaTestRunner from '../../src/KarmaTestRunner'; import { expectTestResults } from '../helpers/assertions'; diff --git a/packages/karma-runner/test/integration/sample.it.spec.ts b/packages/karma-runner/test/integration/sample.it.spec.ts index 552f055938..a759dde254 100644 --- a/packages/karma-runner/test/integration/sample.it.spec.ts +++ b/packages/karma-runner/test/integration/sample.it.spec.ts @@ -1,6 +1,8 @@ +import * as path from 'path'; + import { TestStatus } from '@stryker-mutator/api/test_runner'; import { testInjector } from '@stryker-mutator/test-helpers'; -import * as path from 'path'; + import KarmaTestRunner from '../../src/KarmaTestRunner'; import { expectTestResults } from '../helpers/assertions'; diff --git a/packages/karma-runner/test/unit/KarmaTestRunner.spec.ts b/packages/karma-runner/test/unit/KarmaTestRunner.spec.ts index 4475293152..98bd5dbba2 100644 --- a/packages/karma-runner/test/unit/KarmaTestRunner.spec.ts +++ b/packages/karma-runner/test/unit/KarmaTestRunner.spec.ts @@ -1,14 +1,16 @@ +import { EventEmitter } from 'events'; + import { LoggerFactoryMethod } from '@stryker-mutator/api/logging'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { RunStatus, TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import { EventEmitter } from 'events'; import * as karma from 'karma'; import * as sinon from 'sinon'; + +import strykerKarmaConf = require('../../src/starters/stryker-karma.conf'); import KarmaTestRunner from '../../src/KarmaTestRunner'; import ProjectStarter, * as projectStarterModule from '../../src/starters/ProjectStarter'; -import strykerKarmaConf = require('../../src/starters/stryker-karma.conf'); import StrykerKarmaSetup, { NgConfigOptions } from '../../src/StrykerKarmaSetup'; import StrykerReporter from '../../src/StrykerReporter'; import TestHooksMiddleware from '../../src/TestHooksMiddleware'; diff --git a/packages/karma-runner/test/unit/StrykerReporter.spec.ts b/packages/karma-runner/test/unit/StrykerReporter.spec.ts index 777a484d04..18798cce1d 100644 --- a/packages/karma-runner/test/unit/StrykerReporter.spec.ts +++ b/packages/karma-runner/test/unit/StrykerReporter.spec.ts @@ -1,6 +1,7 @@ import { RunStatus, TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import { expect } from 'chai'; import { TestResults } from 'karma'; + import StrykerReporter, { KarmaSpec } from '../../src/StrykerReporter'; describe('StrykerReporter', () => { diff --git a/packages/karma-runner/test/unit/starters/angularStarter.spec.ts b/packages/karma-runner/test/unit/starters/angularStarter.spec.ts index efc47c8a3e..a86f96afad 100644 --- a/packages/karma-runner/test/unit/starters/angularStarter.spec.ts +++ b/packages/karma-runner/test/unit/starters/angularStarter.spec.ts @@ -2,6 +2,7 @@ import { LoggerFactoryMethod } from '@stryker-mutator/api/logging'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import * as sinon from 'sinon'; + import * as sut from '../../../src/starters/angularStarter'; import * as utils from '../../../src/utils'; diff --git a/packages/karma-runner/test/unit/starters/stryker-karma.conf.spec.ts b/packages/karma-runner/test/unit/starters/stryker-karma.conf.spec.ts index 21a781d19f..7a9ceb9e91 100644 --- a/packages/karma-runner/test/unit/starters/stryker-karma.conf.spec.ts +++ b/packages/karma-runner/test/unit/starters/stryker-karma.conf.spec.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import { Config, ConfigOptions } from 'karma'; -import * as path from 'path'; import * as sinon from 'sinon'; + import sut = require('../../../src/starters/stryker-karma.conf'); import StrykerReporter from '../../../src/StrykerReporter'; import TestHooksMiddleware, { TEST_HOOKS_FILE_NAME } from '../../../src/TestHooksMiddleware'; diff --git a/packages/mocha-framework/src/index.ts b/packages/mocha-framework/src/index.ts index 7971365b77..cb7e44417f 100644 --- a/packages/mocha-framework/src/index.ts +++ b/packages/mocha-framework/src/index.ts @@ -1,4 +1,5 @@ import { declareClassPlugin, PluginKind } from '@stryker-mutator/api/plugin'; + import MochaTestFramework from './MochaTestFramework'; export const strykerPlugins = [declareClassPlugin(PluginKind.TestFramework, 'mocha', MochaTestFramework)]; diff --git a/packages/mocha-framework/test/helpers/initChai.ts b/packages/mocha-framework/test/helpers/initChai.ts index 0d0431d54a..514154da42 100644 --- a/packages/mocha-framework/test/helpers/initChai.ts +++ b/packages/mocha-framework/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/mocha-framework/test/integration/nestedSuite.it.spec.ts b/packages/mocha-framework/test/integration/nestedSuite.it.spec.ts index b48fdde64e..06e0211925 100644 --- a/packages/mocha-framework/test/integration/nestedSuite.it.spec.ts +++ b/packages/mocha-framework/test/integration/nestedSuite.it.spec.ts @@ -1,9 +1,11 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { TestSelection } from '@stryker-mutator/api/test_framework'; import { expect } from 'chai'; import * as execa from 'execa'; -import * as fs from 'fs'; -import * as path from 'path'; import * as rimraf from 'rimraf'; + import MochaTestFramework from '../../src/MochaTestFramework'; interface MochaTestRunResult { diff --git a/packages/mocha-framework/test/unit/MochaTestFramework.spec.ts b/packages/mocha-framework/test/unit/MochaTestFramework.spec.ts index a7ae7f7296..26d60e9335 100644 --- a/packages/mocha-framework/test/unit/MochaTestFramework.spec.ts +++ b/packages/mocha-framework/test/unit/MochaTestFramework.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import MochaTestFramework from '../../src/MochaTestFramework'; describe('MochaTestFramework', () => { diff --git a/packages/mocha-runner/src/LibWrapper.ts b/packages/mocha-runner/src/LibWrapper.ts index 14111b4628..a7cf6316d8 100644 --- a/packages/mocha-runner/src/LibWrapper.ts +++ b/packages/mocha-runner/src/LibWrapper.ts @@ -1,5 +1,6 @@ import * as Mocha from 'mocha'; import * as multimatch from 'multimatch'; + import { MochaOptions } from './MochaOptions'; let loadOptions: undefined | ((argv?: string[] | string) => { [key: string]: any } | undefined); diff --git a/packages/mocha-runner/src/MochaConfigEditor.ts b/packages/mocha-runner/src/MochaConfigEditor.ts index f5c07dbb44..c569a32604 100644 --- a/packages/mocha-runner/src/MochaConfigEditor.ts +++ b/packages/mocha-runner/src/MochaConfigEditor.ts @@ -1,5 +1,6 @@ import { Config, ConfigEditor } from '@stryker-mutator/api/config'; import { tokens } from '@stryker-mutator/api/plugin'; + import MochaOptionsLoader from './MochaOptionsLoader'; import { mochaOptionsKey } from './utils'; diff --git a/packages/mocha-runner/src/MochaOptionsLoader.ts b/packages/mocha-runner/src/MochaOptionsLoader.ts index ad5241588f..d731be134a 100644 --- a/packages/mocha-runner/src/MochaOptionsLoader.ts +++ b/packages/mocha-runner/src/MochaOptionsLoader.ts @@ -1,8 +1,10 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; -import * as fs from 'fs'; -import * as path from 'path'; + import LibWrapper from './LibWrapper'; import { MochaOptions } from './MochaOptions'; import { filterConfig, mochaOptionsKey, serializeArguments } from './utils'; diff --git a/packages/mocha-runner/src/MochaTestRunner.ts b/packages/mocha-runner/src/MochaTestRunner.ts index 6bd4283995..f90b95968a 100644 --- a/packages/mocha-runner/src/MochaTestRunner.ts +++ b/packages/mocha-runner/src/MochaTestRunner.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { StrykerOptions } from '@stryker-mutator/api/core'; import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { RunResult, RunStatus, TestRunner } from '@stryker-mutator/api/test_runner'; -import * as path from 'path'; + import LibWrapper from './LibWrapper'; import { MochaOptions } from './MochaOptions'; import { StrykerMochaReporter } from './StrykerMochaReporter'; diff --git a/packages/mocha-runner/src/StrykerMochaReporter.ts b/packages/mocha-runner/src/StrykerMochaReporter.ts index cd51256782..26880b52a4 100644 --- a/packages/mocha-runner/src/StrykerMochaReporter.ts +++ b/packages/mocha-runner/src/StrykerMochaReporter.ts @@ -1,5 +1,6 @@ import { Logger } from '@stryker-mutator/api/logging'; import { RunResult, RunStatus, TestStatus } from '@stryker-mutator/api/test_runner'; + import Timer from './Timer'; export class StrykerMochaReporter { diff --git a/packages/mocha-runner/test/helpers/initChai.ts b/packages/mocha-runner/test/helpers/initChai.ts index 0d0431d54a..514154da42 100644 --- a/packages/mocha-runner/test/helpers/initChai.ts +++ b/packages/mocha-runner/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/mocha-runner/test/integration/MochaFileResolving.spec.ts b/packages/mocha-runner/test/integration/MochaFileResolving.spec.ts index 76d64165d3..c5cccea9d7 100644 --- a/packages/mocha-runner/test/integration/MochaFileResolving.spec.ts +++ b/packages/mocha-runner/test/integration/MochaFileResolving.spec.ts @@ -1,6 +1,8 @@ +import * as path from 'path'; + import { commonTokens } from '@stryker-mutator/api/plugin'; import { expect } from 'chai'; -import * as path from 'path'; + import { testInjector } from '../../../test-helpers/src'; import MochaOptionsLoader from '../../src/MochaOptionsLoader'; import MochaTestRunner from '../../src/MochaTestRunner'; diff --git a/packages/mocha-runner/test/integration/MochaFramework.it.spec.ts b/packages/mocha-runner/test/integration/MochaFramework.it.spec.ts index c089c95328..dfbcc69bee 100644 --- a/packages/mocha-runner/test/integration/MochaFramework.it.spec.ts +++ b/packages/mocha-runner/test/integration/MochaFramework.it.spec.ts @@ -1,8 +1,10 @@ +import { fork } from 'child_process'; + import { TestSelection } from '@stryker-mutator/api/test_framework'; import { RunResult, RunStatus, TestStatus } from '@stryker-mutator/api/test_runner'; import { expect } from 'chai'; -import { fork } from 'child_process'; import MochaTestFramework from 'stryker-mocha-framework/src/MochaTestFramework'; + import { AUTO_START_ARGUMENT, RunMessage } from './MochaTestFrameworkIntegrationTestWorker'; const test0: Readonly = Object.freeze({ diff --git a/packages/mocha-runner/test/integration/MochaOptionsLoader.it.spec.ts b/packages/mocha-runner/test/integration/MochaOptionsLoader.it.spec.ts index 072555572f..a50d76fd67 100644 --- a/packages/mocha-runner/test/integration/MochaOptionsLoader.it.spec.ts +++ b/packages/mocha-runner/test/integration/MochaOptionsLoader.it.spec.ts @@ -1,6 +1,8 @@ +import * as path from 'path'; + import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as path from 'path'; + import { MochaOptions } from '../../src/MochaOptions'; import MochaOptionsLoader, { DEFAULT_MOCHA_OPTIONS } from '../../src/MochaOptionsLoader'; import { mochaOptionsKey } from '../../src/utils'; diff --git a/packages/mocha-runner/test/integration/MochaTestFrameworkIntegrationTestWorker.ts b/packages/mocha-runner/test/integration/MochaTestFrameworkIntegrationTestWorker.ts index 45e9c7320c..9afe472dcd 100644 --- a/packages/mocha-runner/test/integration/MochaTestFrameworkIntegrationTestWorker.ts +++ b/packages/mocha-runner/test/integration/MochaTestFrameworkIntegrationTestWorker.ts @@ -1,7 +1,9 @@ +import * as path from 'path'; + import { commonTokens } from '@stryker-mutator/api/plugin'; import { RunResult } from '@stryker-mutator/api/test_runner'; import { testInjector } from '@stryker-mutator/test-helpers'; -import * as path from 'path'; + import MochaTestRunner from '../../src/MochaTestRunner'; export const AUTO_START_ARGUMENT = '2e164669-acf1-461c-9c05-2be139614de2'; diff --git a/packages/mocha-runner/test/integration/QUnitSample.it.spec.ts b/packages/mocha-runner/test/integration/QUnitSample.it.spec.ts index afd6c46d8f..5eecd5e5aa 100644 --- a/packages/mocha-runner/test/integration/QUnitSample.it.spec.ts +++ b/packages/mocha-runner/test/integration/QUnitSample.it.spec.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { commonTokens } from '@stryker-mutator/api/plugin'; import { RunStatus } from '@stryker-mutator/api/test_runner'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as path from 'path'; + import MochaTestRunner from '../../src/MochaTestRunner'; import { createMochaOptions } from '../helpers/factories'; diff --git a/packages/mocha-runner/test/integration/SampleProject.it.spec.ts b/packages/mocha-runner/test/integration/SampleProject.it.spec.ts index e23917d645..5cb57d5f41 100644 --- a/packages/mocha-runner/test/integration/SampleProject.it.spec.ts +++ b/packages/mocha-runner/test/integration/SampleProject.it.spec.ts @@ -1,11 +1,14 @@ +import * as path from 'path'; + import { commonTokens } from '@stryker-mutator/api/plugin'; import { RunResult, RunStatus, TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import { testInjector } from '@stryker-mutator/test-helpers'; import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; -import * as path from 'path'; + import MochaTestRunner from '../../src/MochaTestRunner'; import { createMochaOptions } from '../helpers/factories'; + chai.use(chaiAsPromised); const expect = chai.expect; diff --git a/packages/mocha-runner/test/unit/MochaOptionsLoader.spec.ts b/packages/mocha-runner/test/unit/MochaOptionsLoader.spec.ts index a633350116..59077b3d18 100644 --- a/packages/mocha-runner/test/unit/MochaOptionsLoader.spec.ts +++ b/packages/mocha-runner/test/unit/MochaOptionsLoader.spec.ts @@ -1,8 +1,10 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as fs from 'fs'; -import * as path from 'path'; + import sinon = require('sinon'); import LibWrapper from '../../src/LibWrapper'; import { MochaOptions } from '../../src/MochaOptions'; diff --git a/packages/mocha-runner/test/unit/MochaTestRunner.spec.ts b/packages/mocha-runner/test/unit/MochaTestRunner.spec.ts index c90d3e3b3d..e937e03c64 100644 --- a/packages/mocha-runner/test/unit/MochaTestRunner.spec.ts +++ b/packages/mocha-runner/test/unit/MochaTestRunner.spec.ts @@ -1,10 +1,12 @@ +import { EventEmitter } from 'events'; +import * as path from 'path'; + import { commonTokens } from '@stryker-mutator/api/plugin'; import { RunOptions } from '@stryker-mutator/api/test_runner'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import { EventEmitter } from 'events'; import * as Mocha from 'mocha'; -import * as path from 'path'; + import sinon = require('sinon'); import LibWrapper from '../../src/LibWrapper'; import { MochaOptions } from '../../src/MochaOptions'; diff --git a/packages/mocha-runner/test/unit/Timer.spec.ts b/packages/mocha-runner/test/unit/Timer.spec.ts index 1178f2f2bc..db9b15eb85 100644 --- a/packages/mocha-runner/test/unit/Timer.spec.ts +++ b/packages/mocha-runner/test/unit/Timer.spec.ts @@ -1,5 +1,6 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; + import Timer from '../../src/Timer'; describe('Timer', () => { diff --git a/packages/mutator-specification/src/ArrayLiteralMutatorSpec.ts b/packages/mutator-specification/src/ArrayLiteralMutatorSpec.ts index 733a9f0c3d..22750081a7 100644 --- a/packages/mutator-specification/src/ArrayLiteralMutatorSpec.ts +++ b/packages/mutator-specification/src/ArrayLiteralMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function ArrayLiteralMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/ArrayNewExpressionMutatorSpec.ts b/packages/mutator-specification/src/ArrayNewExpressionMutatorSpec.ts index 0b3d63743b..2ef000c6ed 100644 --- a/packages/mutator-specification/src/ArrayNewExpressionMutatorSpec.ts +++ b/packages/mutator-specification/src/ArrayNewExpressionMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function ArrayNewExpressionMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/ArrowFunctionMutatorSpec.ts b/packages/mutator-specification/src/ArrowFunctionMutatorSpec.ts index 9349983c02..3f27ae47a8 100644 --- a/packages/mutator-specification/src/ArrowFunctionMutatorSpec.ts +++ b/packages/mutator-specification/src/ArrowFunctionMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function ArrowFunctionMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/BinaryExpressionMutatorSpec.ts b/packages/mutator-specification/src/BinaryExpressionMutatorSpec.ts index 7434a8bfc5..565b17d1a2 100644 --- a/packages/mutator-specification/src/BinaryExpressionMutatorSpec.ts +++ b/packages/mutator-specification/src/BinaryExpressionMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function BinaryExpressionMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/BlockMutatorSpec.ts b/packages/mutator-specification/src/BlockMutatorSpec.ts index 1be2b825a1..272dfcfd7f 100644 --- a/packages/mutator-specification/src/BlockMutatorSpec.ts +++ b/packages/mutator-specification/src/BlockMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function BlockMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/BooleanSubstitutionMutatorSpec.ts b/packages/mutator-specification/src/BooleanSubstitutionMutatorSpec.ts index 6f372a98c4..a6939fd711 100644 --- a/packages/mutator-specification/src/BooleanSubstitutionMutatorSpec.ts +++ b/packages/mutator-specification/src/BooleanSubstitutionMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function BooleanSubstitutionMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/ConditionalExpressionMutatorSpec.ts b/packages/mutator-specification/src/ConditionalExpressionMutatorSpec.ts index 7f25b88740..a5703436fb 100644 --- a/packages/mutator-specification/src/ConditionalExpressionMutatorSpec.ts +++ b/packages/mutator-specification/src/ConditionalExpressionMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function ConditionalExpressionMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/DoStatementMutatorSpec.ts b/packages/mutator-specification/src/DoStatementMutatorSpec.ts index d43db2de63..b851eaedd3 100644 --- a/packages/mutator-specification/src/DoStatementMutatorSpec.ts +++ b/packages/mutator-specification/src/DoStatementMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function DoStatementMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/ForStatementMutatorSpec.ts b/packages/mutator-specification/src/ForStatementMutatorSpec.ts index 9ba1755d4a..da95b06fb6 100644 --- a/packages/mutator-specification/src/ForStatementMutatorSpec.ts +++ b/packages/mutator-specification/src/ForStatementMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function ForStatementMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/IfStatementMutatorSpec.ts b/packages/mutator-specification/src/IfStatementMutatorSpec.ts index cac39c641c..217cfea380 100644 --- a/packages/mutator-specification/src/IfStatementMutatorSpec.ts +++ b/packages/mutator-specification/src/IfStatementMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function IfStatementMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/ObjectLiteralMutatorSpec.ts b/packages/mutator-specification/src/ObjectLiteralMutatorSpec.ts index 6e7e0cfff1..67457e6298 100644 --- a/packages/mutator-specification/src/ObjectLiteralMutatorSpec.ts +++ b/packages/mutator-specification/src/ObjectLiteralMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function ObjectLiteralMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/PrefixUnaryExpressionMutatorSpec.ts b/packages/mutator-specification/src/PrefixUnaryExpressionMutatorSpec.ts index b9016514c9..b75b24e369 100644 --- a/packages/mutator-specification/src/PrefixUnaryExpressionMutatorSpec.ts +++ b/packages/mutator-specification/src/PrefixUnaryExpressionMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function PrefixUnaryExpressionMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/StringLiteralMutatorSpec.ts b/packages/mutator-specification/src/StringLiteralMutatorSpec.ts index a0954415c2..7cb6094036 100644 --- a/packages/mutator-specification/src/StringLiteralMutatorSpec.ts +++ b/packages/mutator-specification/src/StringLiteralMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function StringLiteralMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/SwitchCaseMutatorSpec.ts b/packages/mutator-specification/src/SwitchCaseMutatorSpec.ts index 800bc3ef3e..512603d246 100644 --- a/packages/mutator-specification/src/SwitchCaseMutatorSpec.ts +++ b/packages/mutator-specification/src/SwitchCaseMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function SwitchCaseMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/mutator-specification/src/WhileStatementMutatorSpec.ts b/packages/mutator-specification/src/WhileStatementMutatorSpec.ts index f1f5e47325..f5d13a067e 100644 --- a/packages/mutator-specification/src/WhileStatementMutatorSpec.ts +++ b/packages/mutator-specification/src/WhileStatementMutatorSpec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import ExpectMutation from './ExpectMutation'; export default function WhileStatementMutatorSpec(name: string, expectMutation: ExpectMutation) { diff --git a/packages/test-helpers/src/TestInjector.ts b/packages/test-helpers/src/TestInjector.ts index e6556e3e02..4bf131188a 100644 --- a/packages/test-helpers/src/TestInjector.ts +++ b/packages/test-helpers/src/TestInjector.ts @@ -3,6 +3,7 @@ import { Logger } from '@stryker-mutator/api/logging'; import { commonTokens, OptionsContext, PluginResolver } from '@stryker-mutator/api/plugin'; import * as sinon from 'sinon'; import { Injector, rootInjector, Scope } from 'typed-inject'; + import * as factory from './factory'; class TestInjector { diff --git a/packages/test-helpers/src/index.ts b/packages/test-helpers/src/index.ts index dfd9efde60..c56bd55def 100644 --- a/packages/test-helpers/src/index.ts +++ b/packages/test-helpers/src/index.ts @@ -1,3 +1,4 @@ import * as factory from './factory'; + export * from './TestInjector'; export { factory }; diff --git a/packages/typescript/src/TypescriptConfigEditor.ts b/packages/typescript/src/TypescriptConfigEditor.ts index 34db3a8685..f1085f0715 100644 --- a/packages/typescript/src/TypescriptConfigEditor.ts +++ b/packages/typescript/src/TypescriptConfigEditor.ts @@ -1,10 +1,12 @@ -import { Config, ConfigEditor } from '@stryker-mutator/api/config'; -import { Logger } from '@stryker-mutator/api/logging'; -import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import * as fs from 'fs'; import * as os from 'os'; import * as path from 'path'; + +import { Config, ConfigEditor } from '@stryker-mutator/api/config'; +import { Logger } from '@stryker-mutator/api/logging'; +import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import * as ts from 'typescript'; + import { CONFIG_KEY, CONFIG_KEY_FILE } from './helpers/keys'; import { normalizeFileForTypescript, normalizeFileFromTypescript } from './helpers/tsHelpers'; diff --git a/packages/typescript/src/TypescriptMutator.ts b/packages/typescript/src/TypescriptMutator.ts index fa4bf4db84..f70b01353b 100644 --- a/packages/typescript/src/TypescriptMutator.ts +++ b/packages/typescript/src/TypescriptMutator.ts @@ -1,8 +1,10 @@ import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { Mutant } from '@stryker-mutator/api/mutant'; import { commonTokens, Injector, OptionsContext, tokens } from '@stryker-mutator/api/plugin'; -import flatMap = require('lodash.flatmap'); import * as ts from 'typescript'; + +import flatMap = require('lodash.flatmap'); + import { getTSConfig, parseFile } from './helpers/tsHelpers'; import { nodeMutators } from './mutator'; import NodeMutator from './mutator/NodeMutator'; diff --git a/packages/typescript/src/TypescriptTranspiler.ts b/packages/typescript/src/TypescriptTranspiler.ts index 4e8a8c1ee2..5785fa90a3 100644 --- a/packages/typescript/src/TypescriptTranspiler.ts +++ b/packages/typescript/src/TypescriptTranspiler.ts @@ -3,6 +3,7 @@ import { LoggerFactoryMethod } from '@stryker-mutator/api/logging'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { Transpiler } from '@stryker-mutator/api/transpile'; import * as ts from 'typescript'; + import { getProjectDirectory, getTSConfig, guardTypescriptVersion, isHeaderFile } from './helpers/tsHelpers'; import TranspileFilter from './transpiler/TranspileFilter'; import TranspilingLanguageService from './transpiler/TranspilingLanguageService'; diff --git a/packages/typescript/src/helpers/tsHelpers.ts b/packages/typescript/src/helpers/tsHelpers.ts index d20c6622e7..121e835f98 100644 --- a/packages/typescript/src/helpers/tsHelpers.ts +++ b/packages/typescript/src/helpers/tsHelpers.ts @@ -1,8 +1,10 @@ -import { File, StrykerOptions } from '@stryker-mutator/api/core'; import * as os from 'os'; import * as path from 'path'; + +import { File, StrykerOptions } from '@stryker-mutator/api/core'; import * as semver from 'semver'; import * as ts from 'typescript'; + import { CONFIG_KEY, CONFIG_KEY_FILE } from './keys'; export function parseFile(file: File, target: ts.ScriptTarget | undefined) { diff --git a/packages/typescript/src/index.ts b/packages/typescript/src/index.ts index 7750fd30ad..75f2337a11 100644 --- a/packages/typescript/src/index.ts +++ b/packages/typescript/src/index.ts @@ -1,4 +1,5 @@ import { declareClassPlugin, declareFactoryPlugin, PluginKind } from '@stryker-mutator/api/plugin'; + import TypescriptConfigEditor from './TypescriptConfigEditor'; import { typescriptMutatorFactory } from './TypescriptMutator'; import TypescriptTranspiler from './TypescriptTranspiler'; diff --git a/packages/typescript/src/mutator/ArrayLiteralMutator.ts b/packages/typescript/src/mutator/ArrayLiteralMutator.ts index fa00ff9ce5..b61194b821 100644 --- a/packages/typescript/src/mutator/ArrayLiteralMutator.ts +++ b/packages/typescript/src/mutator/ArrayLiteralMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class ArrayLiteralMutator extends NodeMutator { diff --git a/packages/typescript/src/mutator/ArrayNewExpressionMutator.ts b/packages/typescript/src/mutator/ArrayNewExpressionMutator.ts index db8357b0a5..8d12f1740b 100644 --- a/packages/typescript/src/mutator/ArrayNewExpressionMutator.ts +++ b/packages/typescript/src/mutator/ArrayNewExpressionMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class ArrayNewExpressionMutator extends NodeMutator { diff --git a/packages/typescript/src/mutator/ArrowFunctionMutator.ts b/packages/typescript/src/mutator/ArrowFunctionMutator.ts index ab66a480ba..3a5b8b4e1d 100644 --- a/packages/typescript/src/mutator/ArrowFunctionMutator.ts +++ b/packages/typescript/src/mutator/ArrowFunctionMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class ArrowFunctionMutator extends NodeMutator { diff --git a/packages/typescript/src/mutator/BinaryExpressionMutator.ts b/packages/typescript/src/mutator/BinaryExpressionMutator.ts index cd552126cd..de774c76f1 100644 --- a/packages/typescript/src/mutator/BinaryExpressionMutator.ts +++ b/packages/typescript/src/mutator/BinaryExpressionMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; const replaceTokens: ts.MapLike = { diff --git a/packages/typescript/src/mutator/BlockMutator.ts b/packages/typescript/src/mutator/BlockMutator.ts index 11ae4965fe..c12a30f00e 100644 --- a/packages/typescript/src/mutator/BlockMutator.ts +++ b/packages/typescript/src/mutator/BlockMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class BlockMutator extends NodeMutator { diff --git a/packages/typescript/src/mutator/BooleanSubstitutionMutator.ts b/packages/typescript/src/mutator/BooleanSubstitutionMutator.ts index 90571184b2..54097c2f6a 100644 --- a/packages/typescript/src/mutator/BooleanSubstitutionMutator.ts +++ b/packages/typescript/src/mutator/BooleanSubstitutionMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class BooleanSubstitutionMutator extends NodeMutator { diff --git a/packages/typescript/src/mutator/ConditionalExpressionMutator.ts b/packages/typescript/src/mutator/ConditionalExpressionMutator.ts index f5761016fe..d7c2062b11 100644 --- a/packages/typescript/src/mutator/ConditionalExpressionMutator.ts +++ b/packages/typescript/src/mutator/ConditionalExpressionMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class ConditionalExpressionMutator extends NodeMutator { diff --git a/packages/typescript/src/mutator/DoStatementMutator.ts b/packages/typescript/src/mutator/DoStatementMutator.ts index 5cb11a322c..949d257aea 100644 --- a/packages/typescript/src/mutator/DoStatementMutator.ts +++ b/packages/typescript/src/mutator/DoStatementMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class DoStatementMutator extends NodeMutator { diff --git a/packages/typescript/src/mutator/ForStatementMutator.ts b/packages/typescript/src/mutator/ForStatementMutator.ts index 5abb161cb3..f4ed464781 100644 --- a/packages/typescript/src/mutator/ForStatementMutator.ts +++ b/packages/typescript/src/mutator/ForStatementMutator.ts @@ -1,5 +1,7 @@ import * as ts from 'typescript'; + import { printNode } from '../helpers/tsHelpers'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class ForStatementMutator extends NodeMutator { diff --git a/packages/typescript/src/mutator/IfStatementMutator.ts b/packages/typescript/src/mutator/IfStatementMutator.ts index ea20c1da1c..b339363b17 100644 --- a/packages/typescript/src/mutator/IfStatementMutator.ts +++ b/packages/typescript/src/mutator/IfStatementMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class IfStatementMutator extends NodeMutator { diff --git a/packages/typescript/src/mutator/NodeMutator.ts b/packages/typescript/src/mutator/NodeMutator.ts index ff1c4cf5b4..285c675c89 100644 --- a/packages/typescript/src/mutator/NodeMutator.ts +++ b/packages/typescript/src/mutator/NodeMutator.ts @@ -1,5 +1,6 @@ -import { Mutant } from '@stryker-mutator/api/mutant'; import * as path from 'path'; + +import { Mutant } from '@stryker-mutator/api/mutant'; import * as ts from 'typescript'; export interface NodeReplacement { diff --git a/packages/typescript/src/mutator/ObjectLiteralMutator.ts b/packages/typescript/src/mutator/ObjectLiteralMutator.ts index ebc28ff5bd..f7b0498de9 100644 --- a/packages/typescript/src/mutator/ObjectLiteralMutator.ts +++ b/packages/typescript/src/mutator/ObjectLiteralMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class ObjectLiteralMutator extends NodeMutator { diff --git a/packages/typescript/src/mutator/PrefixUnaryExpressionMutator.ts b/packages/typescript/src/mutator/PrefixUnaryExpressionMutator.ts index b070aacf62..cb438e237f 100644 --- a/packages/typescript/src/mutator/PrefixUnaryExpressionMutator.ts +++ b/packages/typescript/src/mutator/PrefixUnaryExpressionMutator.ts @@ -1,5 +1,7 @@ import * as ts from 'typescript'; + import { printNode } from '../helpers/tsHelpers'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; const replaceTokens = { diff --git a/packages/typescript/src/mutator/StringLiteralMutator.ts b/packages/typescript/src/mutator/StringLiteralMutator.ts index 67cec77272..ccaad1ce41 100644 --- a/packages/typescript/src/mutator/StringLiteralMutator.ts +++ b/packages/typescript/src/mutator/StringLiteralMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export type AllStringLiterals = diff --git a/packages/typescript/src/mutator/SwitchCaseMutator.ts b/packages/typescript/src/mutator/SwitchCaseMutator.ts index 9f0c960054..0ae9ee39a8 100644 --- a/packages/typescript/src/mutator/SwitchCaseMutator.ts +++ b/packages/typescript/src/mutator/SwitchCaseMutator.ts @@ -1,6 +1,7 @@ import * as ts from 'typescript'; import { printNode } from '../helpers/tsHelpers'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; /** diff --git a/packages/typescript/src/mutator/WhileStatementMutator.ts b/packages/typescript/src/mutator/WhileStatementMutator.ts index a2dfc6efd5..217c4c1621 100644 --- a/packages/typescript/src/mutator/WhileStatementMutator.ts +++ b/packages/typescript/src/mutator/WhileStatementMutator.ts @@ -1,4 +1,5 @@ import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from './NodeMutator'; export default class WhileStatementMutator extends NodeMutator { diff --git a/packages/typescript/src/transpiler/TranspileFilter.ts b/packages/typescript/src/transpiler/TranspileFilter.ts index ce7979f1bb..6290c3849a 100644 --- a/packages/typescript/src/transpiler/TranspileFilter.ts +++ b/packages/typescript/src/transpiler/TranspileFilter.ts @@ -1,4 +1,5 @@ import { StrykerOptions } from '@stryker-mutator/api/core'; + import { getTSConfig, isTypescriptFile, normalizeFileFromTypescript } from '../helpers/tsHelpers'; /** diff --git a/packages/typescript/src/transpiler/TranspilingLanguageService.ts b/packages/typescript/src/transpiler/TranspilingLanguageService.ts index d3a9994f30..409ab697bd 100644 --- a/packages/typescript/src/transpiler/TranspilingLanguageService.ts +++ b/packages/typescript/src/transpiler/TranspilingLanguageService.ts @@ -1,11 +1,15 @@ -import { File } from '@stryker-mutator/api/core'; -import { Logger, LoggerFactoryMethod } from '@stryker-mutator/api/logging'; import * as fs from 'fs'; -import flatMap = require('lodash.flatmap'); import * as os from 'os'; import * as path from 'path'; + +import { Logger, LoggerFactoryMethod } from '@stryker-mutator/api/logging'; +import { File } from '@stryker-mutator/api/core'; import * as ts from 'typescript'; + +import flatMap = require('lodash.flatmap'); + import { isJavaScriptFile, isMapFile, normalizeFileForTypescript, normalizeFileFromTypescript } from '../helpers/tsHelpers'; + import ScriptFile from './ScriptFile'; const libRegex = /^lib\.(?:\w|\.)*\.?d\.ts$/; diff --git a/packages/typescript/test/integration/allowJS.it.spec.ts b/packages/typescript/test/integration/allowJS.it.spec.ts index 131ce53161..453c9d6cb6 100644 --- a/packages/typescript/test/integration/allowJS.it.spec.ts +++ b/packages/typescript/test/integration/allowJS.it.spec.ts @@ -1,9 +1,11 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { File } from '@stryker-mutator/api/core'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as fs from 'fs'; -import * as path from 'path'; + import { CONFIG_KEY } from '../../src/helpers/keys'; import TypescriptConfigEditor from '../../src/TypescriptConfigEditor'; import TypescriptTranspiler from '../../src/TypescriptTranspiler'; diff --git a/packages/typescript/test/integration/configEditor.it.spec.ts b/packages/typescript/test/integration/configEditor.it.spec.ts index 6cc5124b34..64947842c1 100644 --- a/packages/typescript/test/integration/configEditor.it.spec.ts +++ b/packages/typescript/test/integration/configEditor.it.spec.ts @@ -1,7 +1,9 @@ +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as path from 'path'; + import TypescriptConfigEditor from '../../src/TypescriptConfigEditor'; function resolveSampleProject(relativeFileName: string) { diff --git a/packages/typescript/test/integration/ownDogFood.it.spec.ts b/packages/typescript/test/integration/ownDogFood.it.spec.ts index 269e42ea9e..ff121ea324 100644 --- a/packages/typescript/test/integration/ownDogFood.it.spec.ts +++ b/packages/typescript/test/integration/ownDogFood.it.spec.ts @@ -1,9 +1,11 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { File } from '@stryker-mutator/api/core'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as fs from 'fs'; -import * as path from 'path'; + import { CONFIG_KEY } from '../../src/helpers/keys'; import TypescriptConfigEditor from '../../src/TypescriptConfigEditor'; import TypescriptTranspiler from '../../src/TypescriptTranspiler'; diff --git a/packages/typescript/test/integration/sample.it.spec.ts b/packages/typescript/test/integration/sample.it.spec.ts index 87c6452496..aef206026b 100644 --- a/packages/typescript/test/integration/sample.it.spec.ts +++ b/packages/typescript/test/integration/sample.it.spec.ts @@ -1,10 +1,12 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { File } from '@stryker-mutator/api/core'; import { Mutant } from '@stryker-mutator/api/mutant'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as fs from 'fs'; -import * as path from 'path'; + import { CONFIG_KEY } from '../../src/helpers/keys'; import TypescriptConfigEditor from '../../src/TypescriptConfigEditor'; import { typescriptMutatorFactory } from '../../src/TypescriptMutator'; diff --git a/packages/typescript/test/integration/useHeaderFile.ts b/packages/typescript/test/integration/useHeaderFile.ts index 4cb1cf1bf3..6e6a7af82b 100644 --- a/packages/typescript/test/integration/useHeaderFile.ts +++ b/packages/typescript/test/integration/useHeaderFile.ts @@ -1,10 +1,12 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { File } from '@stryker-mutator/api/core'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as fs from 'fs'; -import * as path from 'path'; + import { CONFIG_KEY } from '../../src/helpers/keys'; import TypescriptConfigEditor from '../../src/TypescriptConfigEditor'; import TypescriptTranspiler from '../../src/TypescriptTranspiler'; diff --git a/packages/typescript/test/unit/TypescriptConfigEditor.spec.ts b/packages/typescript/test/unit/TypescriptConfigEditor.spec.ts index a4b8af5128..1e9549202d 100644 --- a/packages/typescript/test/unit/TypescriptConfigEditor.spec.ts +++ b/packages/typescript/test/unit/TypescriptConfigEditor.spec.ts @@ -1,11 +1,14 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as fs from 'fs'; -import * as path from 'path'; import { match, SinonStub } from 'sinon'; -import sinon = require('sinon'); import * as ts from 'typescript'; + +import sinon = require('sinon'); + import TypescriptConfigEditor from './../../src/TypescriptConfigEditor'; const CONFIG_KEY = 'tsconfigFile'; diff --git a/packages/typescript/test/unit/TypescriptMutator.spec.ts b/packages/typescript/test/unit/TypescriptMutator.spec.ts index b69b01a6b9..450c1ddd42 100644 --- a/packages/typescript/test/unit/TypescriptMutator.spec.ts +++ b/packages/typescript/test/unit/TypescriptMutator.spec.ts @@ -1,9 +1,11 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { File } from '@stryker-mutator/api/core'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as fs from 'fs'; -import * as path from 'path'; import * as ts from 'typescript'; + import NodeMutator, { NodeReplacement } from '../../src/mutator/NodeMutator'; import { MUTATORS_TOKEN, TypescriptMutator, typescriptMutatorFactory } from '../../src/TypescriptMutator'; diff --git a/packages/typescript/test/unit/TypescriptTranspiler.spec.ts b/packages/typescript/test/unit/TypescriptTranspiler.spec.ts index 14b85cd2c6..ba35a7d84d 100644 --- a/packages/typescript/test/unit/TypescriptTranspiler.spec.ts +++ b/packages/typescript/test/unit/TypescriptTranspiler.spec.ts @@ -2,8 +2,10 @@ import { File } from '@stryker-mutator/api/core'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import sinon = require('sinon'); import { serialize } from 'surrial'; + +import sinon = require('sinon'); + import TranspileFilter from '../../src/transpiler/TranspileFilter'; import TranspilingLanguageService, * as transpilingLanguageService from '../../src/transpiler/TranspilingLanguageService'; import { EmitOutput } from '../../src/transpiler/TranspilingLanguageService'; diff --git a/packages/typescript/test/unit/helpers/tsHelpers.spec.ts b/packages/typescript/test/unit/helpers/tsHelpers.spec.ts index 121f602477..e195350d94 100644 --- a/packages/typescript/test/unit/helpers/tsHelpers.spec.ts +++ b/packages/typescript/test/unit/helpers/tsHelpers.spec.ts @@ -1,8 +1,10 @@ import { File } from '@stryker-mutator/api/core'; import { expect } from 'chai'; import * as semver from 'semver'; -import sinon = require('sinon'); import * as ts from 'typescript'; + +import sinon = require('sinon'); + import * as tsHelpers from '../../../src/helpers/tsHelpers'; describe('tsHelpers', () => { diff --git a/packages/typescript/test/unit/mutator/ArrayLiteralMutator.spec.ts b/packages/typescript/test/unit/mutator/ArrayLiteralMutator.spec.ts index 4fe3c1388d..a5f6221040 100644 --- a/packages/typescript/test/unit/mutator/ArrayLiteralMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/ArrayLiteralMutator.spec.ts @@ -1,5 +1,7 @@ import { ArrayLiteralMutatorSpec } from '@stryker-mutator/mutator-specification'; + import ArrayLiteralMutator from '../../../src/mutator/ArrayLiteralMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(ArrayLiteralMutatorSpec, ArrayLiteralMutator); diff --git a/packages/typescript/test/unit/mutator/ArrayNewExpressionMutator.spec.ts b/packages/typescript/test/unit/mutator/ArrayNewExpressionMutator.spec.ts index a7e5f41815..9cf2b0aae6 100644 --- a/packages/typescript/test/unit/mutator/ArrayNewExpressionMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/ArrayNewExpressionMutator.spec.ts @@ -1,5 +1,7 @@ import { ArrayNewExpressionMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import ArrayNewExpressionMutator from '../../../src/mutator/ArrayNewExpressionMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(ArrayNewExpressionMutatorSpec, ArrayNewExpressionMutator); diff --git a/packages/typescript/test/unit/mutator/ArrowFunctionMutator.spec.ts b/packages/typescript/test/unit/mutator/ArrowFunctionMutator.spec.ts index d0ae22ff06..0c4c1ccb75 100644 --- a/packages/typescript/test/unit/mutator/ArrowFunctionMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/ArrowFunctionMutator.spec.ts @@ -1,5 +1,7 @@ import ArrowFunctionMutatorSpec from '@stryker-mutator/mutator-specification/src/ArrowFunctionMutatorSpec'; + import ArrowFunctionMutator from '../../../src/mutator/ArrowFunctionMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(ArrowFunctionMutatorSpec, ArrowFunctionMutator); diff --git a/packages/typescript/test/unit/mutator/BinaryExpressionMutator.spec.ts b/packages/typescript/test/unit/mutator/BinaryExpressionMutator.spec.ts index c5c0eec8ef..72fb5f078a 100644 --- a/packages/typescript/test/unit/mutator/BinaryExpressionMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/BinaryExpressionMutator.spec.ts @@ -1,5 +1,7 @@ import BinaryExpressionMutatorSpec from '@stryker-mutator/mutator-specification/src/BinaryExpressionMutatorSpec'; + import BinaryExpressionMutator from '../../../src/mutator/BinaryExpressionMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(BinaryExpressionMutatorSpec, BinaryExpressionMutator); diff --git a/packages/typescript/test/unit/mutator/BlockMutator.spec.ts b/packages/typescript/test/unit/mutator/BlockMutator.spec.ts index ae6205ab01..2792ed9385 100644 --- a/packages/typescript/test/unit/mutator/BlockMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/BlockMutator.spec.ts @@ -1,5 +1,7 @@ import BlockMutatorSpec from '@stryker-mutator/mutator-specification/src/BlockMutatorSpec'; + import BlockMutator from '../../../src/mutator/BlockMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(BlockMutatorSpec, BlockMutator); diff --git a/packages/typescript/test/unit/mutator/BooleanSubstitutionMutator.spec.ts b/packages/typescript/test/unit/mutator/BooleanSubstitutionMutator.spec.ts index 74c205c3bf..99b816293c 100644 --- a/packages/typescript/test/unit/mutator/BooleanSubstitutionMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/BooleanSubstitutionMutator.spec.ts @@ -1,5 +1,7 @@ import BooleanSubstitutionMutatorSpec from '@stryker-mutator/mutator-specification/src/BooleanSubstitutionMutatorSpec'; + import BooleanSubstitutionMutator from '../../../src/mutator/BooleanSubstitutionMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(BooleanSubstitutionMutatorSpec, BooleanSubstitutionMutator); diff --git a/packages/typescript/test/unit/mutator/ConditionalExpressionMutator.spec.ts b/packages/typescript/test/unit/mutator/ConditionalExpressionMutator.spec.ts index f911f18549..b1ec23f131 100644 --- a/packages/typescript/test/unit/mutator/ConditionalExpressionMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/ConditionalExpressionMutator.spec.ts @@ -1,5 +1,7 @@ import ConditionalExpressionMutatorSpec from '@stryker-mutator/mutator-specification/src/ConditionalExpressionMutatorSpec'; + import ConditionalExpressionMutator from '../../../src/mutator/ConditionalExpressionMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(ConditionalExpressionMutatorSpec, ConditionalExpressionMutator); diff --git a/packages/typescript/test/unit/mutator/DoStatementMutator.spec.ts b/packages/typescript/test/unit/mutator/DoStatementMutator.spec.ts index dc47baff4c..8ffc26cdab 100644 --- a/packages/typescript/test/unit/mutator/DoStatementMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/DoStatementMutator.spec.ts @@ -1,5 +1,7 @@ import DoStatementMutatorSpec from '@stryker-mutator/mutator-specification/src/DoStatementMutatorSpec'; + import DoStatementMutator from '../../../src/mutator/DoStatementMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(DoStatementMutatorSpec, DoStatementMutator); diff --git a/packages/typescript/test/unit/mutator/ForStatementMutator.spec.ts b/packages/typescript/test/unit/mutator/ForStatementMutator.spec.ts index 38e15cf38d..faf84e72de 100644 --- a/packages/typescript/test/unit/mutator/ForStatementMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/ForStatementMutator.spec.ts @@ -1,5 +1,7 @@ import { ForStatementMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import ForStatementMutator from '../../../src/mutator/ForStatementMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(ForStatementMutatorSpec, ForStatementMutator); diff --git a/packages/typescript/test/unit/mutator/IfStatementMutator.spec.ts b/packages/typescript/test/unit/mutator/IfStatementMutator.spec.ts index 03423d8eed..1792db7bee 100644 --- a/packages/typescript/test/unit/mutator/IfStatementMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/IfStatementMutator.spec.ts @@ -1,5 +1,7 @@ import IfStatementMutatorSpec from '@stryker-mutator/mutator-specification/src/IfStatementMutatorSpec'; + import IfStatementMutator from '../../../src/mutator/IfStatementMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(IfStatementMutatorSpec, IfStatementMutator); diff --git a/packages/typescript/test/unit/mutator/ObjectLiteralMutator.spec.ts b/packages/typescript/test/unit/mutator/ObjectLiteralMutator.spec.ts index ae5e1ef1ae..9b8a42d277 100644 --- a/packages/typescript/test/unit/mutator/ObjectLiteralMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/ObjectLiteralMutator.spec.ts @@ -1,5 +1,7 @@ import ObjectLiteralMutatorSpec from '@stryker-mutator/mutator-specification/src/ObjectLiteralMutatorSpec'; + import ObjectLiteralMutator from '../../../src/mutator/ObjectLiteralMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(ObjectLiteralMutatorSpec, ObjectLiteralMutator); diff --git a/packages/typescript/test/unit/mutator/PrefixUnaryExpressionMutator.spec.ts b/packages/typescript/test/unit/mutator/PrefixUnaryExpressionMutator.spec.ts index c25d2229a2..434b46130f 100644 --- a/packages/typescript/test/unit/mutator/PrefixUnaryExpressionMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/PrefixUnaryExpressionMutator.spec.ts @@ -1,5 +1,7 @@ import PrefixUnaryExpressionMutatorSpec from '@stryker-mutator/mutator-specification/src/PrefixUnaryExpressionMutatorSpec'; + import PrefixUnaryExpressionMutator from '../../../src/mutator/PrefixUnaryExpressionMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(PrefixUnaryExpressionMutatorSpec, PrefixUnaryExpressionMutator); diff --git a/packages/typescript/test/unit/mutator/StringLiteralMutator.spec.ts b/packages/typescript/test/unit/mutator/StringLiteralMutator.spec.ts index 0abbeeb076..1d4fdf28f1 100644 --- a/packages/typescript/test/unit/mutator/StringLiteralMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/StringLiteralMutator.spec.ts @@ -1,6 +1,8 @@ import StringLiteralMutatorSpec from '@stryker-mutator/mutator-specification/src/StringLiteralMutatorSpec'; + import NodeMutator from '../../../src/mutator/NodeMutator'; import StringLiteralMutator from '../../../src/mutator/StringLiteralMutator'; + import { expectMutation, verifySpecification } from './mutatorAssertions'; verifySpecification(StringLiteralMutatorSpec, StringLiteralMutator); diff --git a/packages/typescript/test/unit/mutator/SwitchCaseMutator.spec.ts b/packages/typescript/test/unit/mutator/SwitchCaseMutator.spec.ts index 4e7506f0ed..7fd5f14a08 100644 --- a/packages/typescript/test/unit/mutator/SwitchCaseMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/SwitchCaseMutator.spec.ts @@ -1,5 +1,7 @@ import SwitchCaseMutatorSpec from '@stryker-mutator/mutator-specification/src/SwitchCaseMutatorSpec'; + import SwitchCaseMutator from '../../../src/mutator/SwitchCaseMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(SwitchCaseMutatorSpec, SwitchCaseMutator); diff --git a/packages/typescript/test/unit/mutator/WhileStatementMutator.spec.ts b/packages/typescript/test/unit/mutator/WhileStatementMutator.spec.ts index 32368be244..c55e08a4cb 100644 --- a/packages/typescript/test/unit/mutator/WhileStatementMutator.spec.ts +++ b/packages/typescript/test/unit/mutator/WhileStatementMutator.spec.ts @@ -1,5 +1,7 @@ import { WhileStatementMutatorSpec } from '@stryker-mutator/mutator-specification/src/index'; + import WhileStatementMutator from '../../../src/mutator/WhileStatementMutator'; + import { verifySpecification } from './mutatorAssertions'; verifySpecification(WhileStatementMutatorSpec, WhileStatementMutator); diff --git a/packages/typescript/test/unit/mutator/mutatorAssertions.ts b/packages/typescript/test/unit/mutator/mutatorAssertions.ts index 82dd630195..2be4417d86 100644 --- a/packages/typescript/test/unit/mutator/mutatorAssertions.ts +++ b/packages/typescript/test/unit/mutator/mutatorAssertions.ts @@ -3,6 +3,7 @@ import { Mutant } from '@stryker-mutator/api/mutant'; import ExpectMutation from '@stryker-mutator/mutator-specification/src/ExpectMutation'; import { expect } from 'chai'; import * as ts from 'typescript'; + import { parseFile } from '../../../src/helpers/tsHelpers'; import NodeMutator from '../../../src/mutator/NodeMutator'; diff --git a/packages/typescript/test/unit/transpile/TranspileFilter.spec.ts b/packages/typescript/test/unit/transpile/TranspileFilter.spec.ts index 38cb17bf27..ce39461e6e 100644 --- a/packages/typescript/test/unit/transpile/TranspileFilter.spec.ts +++ b/packages/typescript/test/unit/transpile/TranspileFilter.spec.ts @@ -1,6 +1,8 @@ +import * as path from 'path'; + import { Config } from '@stryker-mutator/api/config'; import { expect } from 'chai'; -import * as path from 'path'; + import TranspileFilter, { DefaultFilter, TSConfigFilter } from '../../../src/transpiler/TranspileFilter'; describe('TranspileFilter', () => { diff --git a/packages/util/test/helpers/initChai.ts b/packages/util/test/helpers/initChai.ts index 0d0431d54a..514154da42 100644 --- a/packages/util/test/helpers/initChai.ts +++ b/packages/util/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/util/test/unit/StrykerError.spec.ts b/packages/util/test/unit/StrykerError.spec.ts index b9d42c2fc0..7301260a2f 100644 --- a/packages/util/test/unit/StrykerError.spec.ts +++ b/packages/util/test/unit/StrykerError.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import { errorToString } from '../../src/errors'; import StrykerError from '../../src/StrykerError'; diff --git a/packages/util/test/unit/childProcessAsPromised.spec.ts b/packages/util/test/unit/childProcessAsPromised.spec.ts index 78f1e0c99c..1299842f89 100644 --- a/packages/util/test/unit/childProcessAsPromised.spec.ts +++ b/packages/util/test/unit/childProcessAsPromised.spec.ts @@ -1,6 +1,8 @@ -import { expect } from 'chai'; -import childProcess = require('child_process'); +import * as childProcess from 'child_process'; import { promisify } from 'util'; + +import { expect } from 'chai'; + import { childProcessAsPromised } from '../../src'; describe('childProcessAsPromised', () => { diff --git a/packages/util/test/unit/errors.spec.ts b/packages/util/test/unit/errors.spec.ts index 20f752caa1..01b0ce8407 100644 --- a/packages/util/test/unit/errors.spec.ts +++ b/packages/util/test/unit/errors.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import { errorToString } from '../../src/errors'; describe('errors', () => { diff --git a/packages/util/test/unit/fsAsPromised.spec.ts b/packages/util/test/unit/fsAsPromised.spec.ts index 5cd496b4f3..57108e6e0b 100644 --- a/packages/util/test/unit/fsAsPromised.spec.ts +++ b/packages/util/test/unit/fsAsPromised.spec.ts @@ -1,6 +1,8 @@ -import { expect } from 'chai'; -import fs = require('fs'); +import * as fs from 'fs'; import { promisify } from 'util'; + +import { expect } from 'chai'; + import { fsAsPromised } from '../../src'; describe('fsAsPromised', () => { diff --git a/packages/util/test/unit/stringUtils.spec.ts b/packages/util/test/unit/stringUtils.spec.ts index fb1260cb32..fe6937e861 100644 --- a/packages/util/test/unit/stringUtils.spec.ts +++ b/packages/util/test/unit/stringUtils.spec.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; + import { normalizeWhitespaces } from '../../src'; describe('stringUtils', () => { diff --git a/packages/vue-mutator/src/VueMutator.ts b/packages/vue-mutator/src/VueMutator.ts index 93102c1d7f..ed880a09f4 100644 --- a/packages/vue-mutator/src/VueMutator.ts +++ b/packages/vue-mutator/src/VueMutator.ts @@ -1,7 +1,9 @@ import { File } from '@stryker-mutator/api/core'; import { Mutant, Mutator } from '@stryker-mutator/api/mutant'; import { tokens } from '@stryker-mutator/api/plugin'; + import { MUTATORS_TOKEN } from './helpers/MutatorHelpers'; + const compiler = require('vue-template-compiler'); export default class VueMutator implements Mutator { diff --git a/packages/vue-mutator/src/index.ts b/packages/vue-mutator/src/index.ts index 6f241a0746..92980343f4 100644 --- a/packages/vue-mutator/src/index.ts +++ b/packages/vue-mutator/src/index.ts @@ -1,4 +1,5 @@ import { commonTokens, declareFactoryPlugin, Injector, OptionsContext, PluginKind, tokens } from '@stryker-mutator/api/plugin'; + import { MUTATORS_TOKEN, mutatorsFactory } from './helpers/MutatorHelpers'; import VueMutator from './VueMutator'; diff --git a/packages/vue-mutator/test/helpers/initSinon.ts b/packages/vue-mutator/test/helpers/initSinon.ts index e1976b3616..79b73de392 100644 --- a/packages/vue-mutator/test/helpers/initSinon.ts +++ b/packages/vue-mutator/test/helpers/initSinon.ts @@ -3,6 +3,7 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinon from 'sinon'; import * as sinonChai from 'sinon-chai'; + chai.use(chaiAsPromised); chai.use(sinonChai); afterEach(() => { diff --git a/packages/vue-mutator/test/integration/VueMutator.it.spec.ts b/packages/vue-mutator/test/integration/VueMutator.it.spec.ts index 2b43d7430e..bcd169989d 100644 --- a/packages/vue-mutator/test/integration/VueMutator.it.spec.ts +++ b/packages/vue-mutator/test/integration/VueMutator.it.spec.ts @@ -5,6 +5,7 @@ import { strykerPlugins as javascriptMutatorStrykerPlugins } from '@stryker-muta import { testInjector } from '@stryker-mutator/test-helpers'; import { strykerPlugins as typescriptMutatorStrykerPlugins } from '@stryker-mutator/typescript'; import { expect } from 'chai'; + import { strykerPlugins } from '../../src/index'; const javascriptMutatorPlugin = javascriptMutatorStrykerPlugins.find(plugin => plugin.kind === PluginKind.Mutator); diff --git a/packages/vue-mutator/test/unit/VueMutator.spec.ts b/packages/vue-mutator/test/unit/VueMutator.spec.ts index ee8b55d437..f2192b2841 100644 --- a/packages/vue-mutator/test/unit/VueMutator.spec.ts +++ b/packages/vue-mutator/test/unit/VueMutator.spec.ts @@ -4,6 +4,7 @@ import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import { SinonStubbedInstance } from 'sinon'; import * as sinon from 'sinon'; + import * as MutatorHelpers from '../../src/helpers/MutatorHelpers'; import VueMutator from '../../src/VueMutator'; diff --git a/packages/wct-runner/src/WctLogger.ts b/packages/wct-runner/src/WctLogger.ts index ba8781c033..e5b3162fdb 100644 --- a/packages/wct-runner/src/WctLogger.ts +++ b/packages/wct-runner/src/WctLogger.ts @@ -1,6 +1,7 @@ -import { Logger } from '@stryker-mutator/api/logging'; import { EventEmitter } from 'events'; +import { Logger } from '@stryker-mutator/api/logging'; + export default class WctLogger { private readonly logProxy = { ['log:debug']: this.log.debug.bind(this.log), diff --git a/packages/wct-runner/src/WctReporter.ts b/packages/wct-runner/src/WctReporter.ts index 875014d709..d1e05eb21c 100644 --- a/packages/wct-runner/src/WctReporter.ts +++ b/packages/wct-runner/src/WctReporter.ts @@ -1,5 +1,6 @@ -import { TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import { EventEmitter } from 'events'; + +import { TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import { BrowserDef } from 'web-component-tester/runner/browserrunner'; import { CompletedState, TestEndData } from 'web-component-tester/runner/clireporter'; diff --git a/packages/wct-runner/src/WctTestRunner.ts b/packages/wct-runner/src/WctTestRunner.ts index 50b5985852..9a1b3cd587 100644 --- a/packages/wct-runner/src/WctTestRunner.ts +++ b/packages/wct-runner/src/WctTestRunner.ts @@ -4,8 +4,10 @@ import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { RunResult, RunStatus, TestRunner } from '@stryker-mutator/api/test_runner'; import { steps } from 'web-component-tester'; import { Context } from 'web-component-tester/runner/context'; + import WctLogger from './WctLogger'; import WctReporter from './WctReporter'; + const WCT_PACKAGE = 'web-component-tester'; const FORCED_WCT_OPTIONS = Object.freeze({ persistent: false diff --git a/packages/wct-runner/src/index.ts b/packages/wct-runner/src/index.ts index 28d0358894..96833d24b5 100644 --- a/packages/wct-runner/src/index.ts +++ b/packages/wct-runner/src/index.ts @@ -1,4 +1,5 @@ import { declareClassPlugin, PluginKind } from '@stryker-mutator/api/plugin'; + import WctTestRunner from './WctTestRunner'; export const strykerPlugins = [declareClassPlugin(PluginKind.TestRunner, 'wct', WctTestRunner)]; diff --git a/packages/wct-runner/test/helpers/initChai.ts b/packages/wct-runner/test/helpers/initChai.ts index 0d0431d54a..514154da42 100644 --- a/packages/wct-runner/test/helpers/initChai.ts +++ b/packages/wct-runner/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/wct-runner/test/integration/WctTestRunner.it.spec.ts b/packages/wct-runner/test/integration/WctTestRunner.it.spec.ts index 4adf00a11b..895eae52bd 100644 --- a/packages/wct-runner/test/integration/WctTestRunner.it.spec.ts +++ b/packages/wct-runner/test/integration/WctTestRunner.it.spec.ts @@ -1,8 +1,10 @@ +import * as path from 'path'; + import { RunResult, RunStatus, TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import { testInjector } from '@stryker-mutator/test-helpers'; import { normalizeWhitespaces } from '@stryker-mutator/util'; import { expect } from 'chai'; -import * as path from 'path'; + import WctTestRunner from '../../src/WctTestRunner'; type TimelessRunResult = { diff --git a/packages/wct-runner/test/unit/WctLogger.spec.ts b/packages/wct-runner/test/unit/WctLogger.spec.ts index 47417aa255..1f9eee1bda 100644 --- a/packages/wct-runner/test/unit/WctLogger.spec.ts +++ b/packages/wct-runner/test/unit/WctLogger.spec.ts @@ -1,6 +1,8 @@ +import { EventEmitter } from 'events'; + import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import { EventEmitter } from 'events'; + import WctLogger from '../../src/WctLogger'; describe(WctLogger.name, () => { diff --git a/packages/wct-runner/test/unit/WctReporter.spec.ts b/packages/wct-runner/test/unit/WctReporter.spec.ts index fc2fb69bf4..cba052ffc3 100644 --- a/packages/wct-runner/test/unit/WctReporter.spec.ts +++ b/packages/wct-runner/test/unit/WctReporter.spec.ts @@ -1,8 +1,10 @@ +import { EventEmitter } from 'events'; + import { TestResult, TestStatus } from '@stryker-mutator/api/test_runner'; import { expect } from 'chai'; -import { EventEmitter } from 'events'; import * as sinon from 'sinon'; import { TestEndData } from 'web-component-tester/runner/clireporter'; + import WctReporter from '../../src/WctReporter'; describe(WctReporter.name, () => { diff --git a/packages/wct-runner/test/unit/WctTestRunner.spec.ts b/packages/wct-runner/test/unit/WctTestRunner.spec.ts index db27e0612f..c053b57929 100644 --- a/packages/wct-runner/test/unit/WctTestRunner.spec.ts +++ b/packages/wct-runner/test/unit/WctTestRunner.spec.ts @@ -5,6 +5,7 @@ import * as sinon from 'sinon'; import { steps } from 'web-component-tester'; import * as wctModule from 'web-component-tester'; import * as contextModule from 'web-component-tester/runner/context'; + import WctLogger, * as wctLoggerModule from '../../src/WctLogger'; import WctReporter, * as wctReporterModule from '../../src/WctReporter'; import WctTestRunner from '../../src/WctTestRunner'; diff --git a/packages/webpack-transpiler/src/WebpackTranspiler.ts b/packages/webpack-transpiler/src/WebpackTranspiler.ts index dea8ac9e10..22f2afd2cd 100644 --- a/packages/webpack-transpiler/src/WebpackTranspiler.ts +++ b/packages/webpack-transpiler/src/WebpackTranspiler.ts @@ -1,6 +1,7 @@ import { File, StrykerOptions } from '@stryker-mutator/api/core'; import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { Transpiler } from '@stryker-mutator/api/transpile'; + import ConfigLoader from './compiler/ConfigLoader'; import WebpackCompiler from './compiler/WebpackCompiler'; import { pluginTokens } from './pluginTokens'; diff --git a/packages/webpack-transpiler/src/compiler/ConfigLoader.ts b/packages/webpack-transpiler/src/compiler/ConfigLoader.ts index 21eda2f0f5..d3cf6f4974 100644 --- a/packages/webpack-transpiler/src/compiler/ConfigLoader.ts +++ b/packages/webpack-transpiler/src/compiler/ConfigLoader.ts @@ -1,8 +1,10 @@ -import { Logger } from '@stryker-mutator/api/logging'; -import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import * as fs from 'fs'; import * as path from 'path'; + +import { Logger } from '@stryker-mutator/api/logging'; +import { commonTokens, tokens } from '@stryker-mutator/api/plugin'; import { Configuration } from 'webpack'; + import { pluginTokens } from '../pluginTokens'; import { StrykerWebpackConfig } from '../WebpackTranspiler'; diff --git a/packages/webpack-transpiler/src/compiler/WebpackCompiler.ts b/packages/webpack-transpiler/src/compiler/WebpackCompiler.ts index af74bdef5b..c7df941de1 100644 --- a/packages/webpack-transpiler/src/compiler/WebpackCompiler.ts +++ b/packages/webpack-transpiler/src/compiler/WebpackCompiler.ts @@ -1,7 +1,9 @@ import { File } from '@stryker-mutator/api/core'; import { Compiler, Configuration } from 'webpack'; + import InputFileSystem from '../fs/InputFileSystem'; import OutputFileSystem from '../fs/OutputFileSystem'; + import webpack from './Webpack'; export default class WebpackCompiler { diff --git a/packages/webpack-transpiler/src/fs/InputFileSystem.ts b/packages/webpack-transpiler/src/fs/InputFileSystem.ts index b3aa4de3d7..f4dd37c6c7 100644 --- a/packages/webpack-transpiler/src/fs/InputFileSystem.ts +++ b/packages/webpack-transpiler/src/fs/InputFileSystem.ts @@ -1,7 +1,10 @@ -import { CachedInputFileSystem, NodeJsInputFileSystem, Stats } from 'enhanced-resolve'; import * as fs from 'fs'; import { dirname } from 'path'; + +import { CachedInputFileSystem, NodeJsInputFileSystem, Stats } from 'enhanced-resolve'; + import { Callback, webpack } from '../types'; + import MemoryFS from './MemoryFS'; // Cache duration is same as webpack has diff --git a/packages/webpack-transpiler/src/fs/OutputFileSystem.ts b/packages/webpack-transpiler/src/fs/OutputFileSystem.ts index 0b171c8c70..5e5876170e 100644 --- a/packages/webpack-transpiler/src/fs/OutputFileSystem.ts +++ b/packages/webpack-transpiler/src/fs/OutputFileSystem.ts @@ -1,6 +1,8 @@ -import { File } from '@stryker-mutator/api/core'; import { PathLike } from 'fs'; import * as path from 'path'; + +import { File } from '@stryker-mutator/api/core'; + import { Callback, EmptyCallback, webpack } from '../types'; export default class OutputFileSystem implements webpack.OutputFileSystem { diff --git a/packages/webpack-transpiler/src/index.ts b/packages/webpack-transpiler/src/index.ts index 6027b0cc94..dd41572875 100644 --- a/packages/webpack-transpiler/src/index.ts +++ b/packages/webpack-transpiler/src/index.ts @@ -1,4 +1,5 @@ import { commonTokens, declareFactoryPlugin, Injector, PluginKind, tokens, TranspilerPluginContext } from '@stryker-mutator/api/plugin'; + import ConfigLoader from './compiler/ConfigLoader'; import { pluginTokens } from './pluginTokens'; import WebpackTranspiler from './WebpackTranspiler'; diff --git a/packages/webpack-transpiler/test/helpers/initChai.ts b/packages/webpack-transpiler/test/helpers/initChai.ts index 0d0431d54a..514154da42 100644 --- a/packages/webpack-transpiler/test/helpers/initChai.ts +++ b/packages/webpack-transpiler/test/helpers/initChai.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as sinonChai from 'sinon-chai'; + chai.use(sinonChai); chai.use(chaiAsPromised); diff --git a/packages/webpack-transpiler/test/helpers/producers.ts b/packages/webpack-transpiler/test/helpers/producers.ts index 16d9b5e019..410f1f5979 100644 --- a/packages/webpack-transpiler/test/helpers/producers.ts +++ b/packages/webpack-transpiler/test/helpers/producers.ts @@ -1,7 +1,9 @@ import { File } from '@stryker-mutator/api/core'; import * as sinon from 'sinon'; import { Configuration } from 'webpack'; + import { StrykerWebpackConfig } from '../../src/WebpackTranspiler'; + import { WebpackCompilerMock } from './mockInterfaces'; export type Mock = { [K in keyof T]: sinon.SinonStub }; diff --git a/packages/webpack-transpiler/test/integration/inputFS.it.spec.ts b/packages/webpack-transpiler/test/integration/inputFS.it.spec.ts index 35c15c298a..11a422b7a4 100644 --- a/packages/webpack-transpiler/test/integration/inputFS.it.spec.ts +++ b/packages/webpack-transpiler/test/integration/inputFS.it.spec.ts @@ -1,5 +1,7 @@ -import { expect } from 'chai'; import * as path from 'path'; + +import { expect } from 'chai'; + import InputFileSystem from '../../src/fs/InputFileSystem'; function testResourcePath(...pathSegments: string[]) { diff --git a/packages/webpack-transpiler/test/integration/transpiler.it.spec.ts b/packages/webpack-transpiler/test/integration/transpiler.it.spec.ts index f5b876bf71..9571262012 100644 --- a/packages/webpack-transpiler/test/integration/transpiler.it.spec.ts +++ b/packages/webpack-transpiler/test/integration/transpiler.it.spec.ts @@ -1,9 +1,11 @@ +import * as fs from 'fs'; +import * as path from 'path'; + import { File } from '@stryker-mutator/api/core'; import { commonTokens } from '@stryker-mutator/api/plugin'; import { testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; -import * as fs from 'fs'; -import * as path from 'path'; + import ConfigLoader from '../../src/compiler/ConfigLoader'; import { pluginTokens } from '../../src/pluginTokens'; import WebpackTranspiler from '../../src/WebpackTranspiler'; diff --git a/packages/webpack-transpiler/test/unit/WebpackTranspiler.spec.ts b/packages/webpack-transpiler/test/unit/WebpackTranspiler.spec.ts index c1e6552d8f..99ad2cc4f9 100644 --- a/packages/webpack-transpiler/test/unit/WebpackTranspiler.spec.ts +++ b/packages/webpack-transpiler/test/unit/WebpackTranspiler.spec.ts @@ -4,6 +4,7 @@ import { factory, testInjector } from '@stryker-mutator/test-helpers'; import { expect } from 'chai'; import * as sinon from 'sinon'; import { Configuration } from 'webpack'; + import ConfigLoader from '../../src/compiler/ConfigLoader'; import WebpackCompiler, * as webpackCompilerModule from '../../src/compiler/WebpackCompiler'; import WebpackTranspiler from '../../src/WebpackTranspiler'; diff --git a/packages/webpack-transpiler/test/unit/compiler/ConfigLoader.spec.ts b/packages/webpack-transpiler/test/unit/compiler/ConfigLoader.spec.ts index 27fb75566e..183e1846fb 100644 --- a/packages/webpack-transpiler/test/unit/compiler/ConfigLoader.spec.ts +++ b/packages/webpack-transpiler/test/unit/compiler/ConfigLoader.spec.ts @@ -1,9 +1,11 @@ -import { testInjector } from '@stryker-mutator/test-helpers'; -import { expect } from 'chai'; import * as fs from 'fs'; import * as path from 'path'; + +import { testInjector } from '@stryker-mutator/test-helpers'; +import { expect } from 'chai'; import * as sinon from 'sinon'; import { Configuration, Plugin } from 'webpack'; + import ConfigLoader from '../../../src/compiler/ConfigLoader'; import { pluginTokens } from '../../../src/pluginTokens'; import { createStrykerWebpackConfig } from '../../helpers/producers'; diff --git a/packages/webpack-transpiler/test/unit/compiler/WebpackCompiler.spec.ts b/packages/webpack-transpiler/test/unit/compiler/WebpackCompiler.spec.ts index 0cbcc2a3c9..ae12977559 100644 --- a/packages/webpack-transpiler/test/unit/compiler/WebpackCompiler.spec.ts +++ b/packages/webpack-transpiler/test/unit/compiler/WebpackCompiler.spec.ts @@ -2,6 +2,7 @@ import { File } from '@stryker-mutator/api/core'; import { expect } from 'chai'; import * as sinon from 'sinon'; import { Configuration } from 'webpack'; + import * as webpack from '../../../src/compiler/Webpack'; import WebpackCompiler from '../../../src/compiler/WebpackCompiler'; import InputFileSystem from '../../../src/fs/InputFileSystem'; diff --git a/packages/webpack-transpiler/test/unit/fs/InputFileSystem.spec.ts b/packages/webpack-transpiler/test/unit/fs/InputFileSystem.spec.ts index e0eccb21b2..6b99d872c2 100644 --- a/packages/webpack-transpiler/test/unit/fs/InputFileSystem.spec.ts +++ b/packages/webpack-transpiler/test/unit/fs/InputFileSystem.spec.ts @@ -1,6 +1,7 @@ import { expect } from 'chai'; import { CachedInputFileSystem } from 'enhanced-resolve'; import * as sinon from 'sinon'; + import InputFileSystem from '../../../src/fs/InputFileSystem'; import MemoryFS, * as memoryFSModule from '../../../src/fs/MemoryFS'; import { createMockInstance, Mock } from '../../helpers/producers'; diff --git a/packages/webpack-transpiler/test/unit/fs/OutputFileSystem.spec.ts b/packages/webpack-transpiler/test/unit/fs/OutputFileSystem.spec.ts index 1565e5f5d8..9e5aeafd68 100644 --- a/packages/webpack-transpiler/test/unit/fs/OutputFileSystem.spec.ts +++ b/packages/webpack-transpiler/test/unit/fs/OutputFileSystem.spec.ts @@ -1,6 +1,8 @@ +import * as path from 'path'; + import { File } from '@stryker-mutator/api/core'; import { expect } from 'chai'; -import * as path from 'path'; + import OutputFileSystem from '../../../src/fs/OutputFileSystem'; describe('OutputFileSystem', () => {