perf: more cleaning

e2e/__tests__/__snapshots__/hoisting.test.ts.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Hoisting test with template "default" should pass 1`] = `
+exports[`Hoisting test should pass using template "default" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  
@@ -17,7 +17,7 @@ jest exit code: 0
  ================================================================================
 `;
 
-exports[`Hoisting test with template "with-babel-6" should pass 1`] = `
+exports[`Hoisting test should pass using template "with-babel-6" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  
@@ -34,7 +34,7 @@ jest exit code: 0
  ================================================================================
 `;
 
-exports[`Hoisting test with template "with-babel-7" should pass 1`] = `
+exports[`Hoisting test should pass using template "with-babel-7" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  
@@ -51,7 +51,7 @@ jest exit code: 0
  ================================================================================
 `;
 
-exports[`Hoisting test with template "with-jest-22" should pass 1`] = `
+exports[`Hoisting test should pass using template "with-jest-22" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  

e2e/__tests__/__snapshots__/simple.test.ts.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Simple test with template "default" should pass 1`] = `
+exports[`Simple test should pass using template "default" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  
@@ -17,7 +17,7 @@ jest exit code: 0
  ================================================================================
 `;
 
-exports[`Simple test with template "with-babel-6" should pass 1`] = `
+exports[`Simple test should pass using template "with-babel-6" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  
@@ -34,7 +34,7 @@ jest exit code: 0
  ================================================================================
 `;
 
-exports[`Simple test with template "with-babel-7" should pass 1`] = `
+exports[`Simple test should pass using template "with-babel-7" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  
@@ -51,7 +51,7 @@ jest exit code: 0
  ================================================================================
 `;
 
-exports[`Simple test with template "with-jest-22" should pass 1`] = `
+exports[`Simple test should pass using template "with-jest-22" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  

e2e/__tests__/__snapshots__/source-map.test.ts.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Source maps console.log() with template "default" should pass reporting correct line number 1`] = `
+exports[`Source maps console.log() should pass reporting correct line number using template "default" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  console.log echo.spec.ts:5
@@ -21,7 +21,7 @@ jest exit code: 0
  ================================================================================
 `;
 
-exports[`Source maps console.log() with template "with-babel-6" should pass reporting correct line number 1`] = `
+exports[`Source maps console.log() should pass reporting correct line number using template "with-babel-6" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  console.log echo.spec.ts:5
@@ -42,7 +42,7 @@ jest exit code: 0
  ================================================================================
 `;
 
-exports[`Source maps console.log() with template "with-babel-7" should pass reporting correct line number 1`] = `
+exports[`Source maps console.log() should pass reporting correct line number using template "with-babel-7" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  console.log echo.spec.ts:5
@@ -63,7 +63,7 @@ jest exit code: 0
  ================================================================================
 `;
 
-exports[`Source maps console.log() with template "with-jest-22" should pass reporting correct line number 1`] = `
+exports[`Source maps console.log() should pass reporting correct line number using template "with-jest-22" 1`] = `
 jest exit code: 0
  ===[ STDOUT ]===================================================================
  console.log echo.spec.ts:5
@@ -84,7 +84,7 @@ jest exit code: 0
  ================================================================================
 `;
 
-exports[`Source maps throw new Error() with template "default" should fail reporting correct line number 1`] = `
+exports[`Source maps throw new Error() should fail reporting correct line number using template "default" 1`] = `
 jest exit code: 1
  ===[ STDOUT ]===================================================================
  console.log echo.spec.ts:5
@@ -120,7 +120,7 @@ jest exit code: 1
  ================================================================================
 `;
 
-exports[`Source maps throw new Error() with template "with-babel-6" should fail reporting correct line number 1`] = `
+exports[`Source maps throw new Error() should fail reporting correct line number using template "with-babel-6" 1`] = `
 jest exit code: 1
  ===[ STDOUT ]===================================================================
  console.log echo.spec.ts:5
@@ -156,7 +156,7 @@ jest exit code: 1
  ================================================================================
 `;
 
-exports[`Source maps throw new Error() with template "with-babel-7" should fail reporting correct line number 1`] = `
+exports[`Source maps throw new Error() should fail reporting correct line number using template "with-babel-7" 1`] = `
 jest exit code: 1
  ===[ STDOUT ]===================================================================
  console.log echo.spec.ts:5
@@ -192,7 +192,7 @@ jest exit code: 1
  ================================================================================
 `;
 
-exports[`Source maps throw new Error() with template "with-jest-22" should fail reporting correct line number 1`] = `
+exports[`Source maps throw new Error() should fail reporting correct line number using template "with-jest-22" 1`] = `
 jest exit code: 1
  ===[ STDOUT ]===================================================================
  console.log echo.spec.ts:5

e2e/__tests__/hoisting.test.ts

@@ -4,17 +4,11 @@ import { allPackageSets } from '../__helpers__/templates';
 describe('Hoisting test', () => {
  const testCase = configureTestCase('hoisting', { args: ['--no-cache'] });
 
- testCase.runWithTemplates(
- allPackageSets,
- 0,
- (runTest, { describeLabel, itLabel }) => {
- describe(describeLabel, () => {
- it(itLabel, () => {
- const result = runTest();
- expect(result.status).toBe(0);
- expect(result).toMatchSnapshot();
- });
- });
- },
- );
+ testCase.runWithTemplates(allPackageSets, 0, (runTest, { testLabel }) => {
+ it(testLabel, () => {
+ const result = runTest();
+ expect(result.status).toBe(0);
+ expect(result).toMatchSnapshot();
+ });
+ });
 });

e2e/__tests__/simple.test.ts

@@ -4,17 +4,11 @@ import { allPackageSets } from '../__helpers__/templates';
 describe('Simple test', () => {
  const testCase = configureTestCase('simple', { args: ['--no-cache'] });
 
- testCase.runWithTemplates(
- allPackageSets,
- 0,
- (runTest, { describeLabel, itLabel }) => {
- describe(describeLabel, () => {
- it(itLabel, () => {
- const result = runTest();
- expect(result.status).toBe(0);
- expect(result).toMatchSnapshot();
- });
- });
- },
- );
+ testCase.runWithTemplates(allPackageSets, 0, (runTest, { testLabel }) => {
+ it(testLabel, () => {
+ const result = runTest();
+ expect(result.status).toBe(0);
+ expect(result).toMatchSnapshot();
+ });
+ });
 });

e2e/__tests__/source-map.test.ts

@@ -8,13 +8,11 @@ describe('Source maps', () => {
  testCase.runWithTemplates(
  allPackageSets,
  0,
- (runTest, { describeLabel }) => {
- describe(describeLabel, () => {
- it('should pass reporting correct line number', () => {
- const result = runTest();
- expect(result.status).toBe(0);
- expect(result).toMatchSnapshot();
- });
+ (runTest, { templateName }) => {
+ it(`should pass reporting correct line number using template "${templateName}"`, () => {
+ const result = runTest();
+ expect(result.status).toBe(0);
+ expect(result).toMatchSnapshot();
  });
  },
  );
@@ -29,13 +27,11 @@ describe('Source maps', () => {
  testCase.runWithTemplates(
  allPackageSets,
  1,
- (runTest, { describeLabel }) => {
- describe(describeLabel, () => {
- it('should fail reporting correct line number', () => {
- const result = runTest();
- expect(result.status).toBe(1);
- expect(result).toMatchSnapshot();
- });
+ (runTest, { templateName }) => {
+ it(`should fail reporting correct line number using template "${templateName}"`, () => {
+ const result = runTest();
+ expect(result.status).toBe(1);
+ expect(result).toMatchSnapshot();
  });
  },
  );

src/utils/diagnostics.ts → src/diagnostics.ts

@@ -1,4 +1,4 @@
-import { DiagnosticTypes, DiagnosticSets, diagnosticSets } from '../types';
+import { DiagnosticTypes, DiagnosticSets, diagnosticSets } from './types';
 
 export const isDiagnosticType = (val: any): val is DiagnosticTypes => {
  return val && DiagnosticTypes[val] === val;

src/index.ts

@@ -2,7 +2,7 @@
 import { TsJestGlobalOptions, TsJestConfig } from './types';
 import TsProgram from './ts-program';
 import Memoize from './memoize';
-import { normalizeDiagnosticTypes } from './utils/diagnostics';
+import { normalizeDiagnosticTypes } from './diagnostics';
 
 const rootDirFor = (jestConfig: jest.ProjectConfig): string => {
  return jestConfig.rootDir || process.cwd();

src/types.ts

@@ -1,6 +1,5 @@
 import * as _babelJest from 'babel-jest';
-import { CompilerOptions, Node } from 'typescript';
-import TransformationManager from './transformers/manager';
+import { CompilerOptions } from 'typescript';
 
 export type TBabelJest = typeof _babelJest;