chore: comit-al before testing with ts-node API

Author: huafu

src/__helpers__/fakers.ts

@@ -1,4 +1,4 @@
-import { TsJestGlobalOptions, BabelConfig } from '../types';
+import { TsJestGlobalOptions, BabelConfig, TsJestConfig } from '../types';
 import { resolve } from 'path';
 import { ImportReasons } from '../utils/messages';
 
@@ -52,10 +52,14 @@ describe('hello', () => {
 `;
 }
 
-export function tsJestConfig<T extends TsJestGlobalOptions>(
-  options?: TsJestGlobalOptions,
-): T {
-  return { ...options } as any;
+export function tsJestConfig(options?: Partial<TsJestConfig>): TsJestConfig {
+  return {
+    babelJest: undefined,
+    tsConfig: undefined,
+    diagnostics: [],
+    stringifyContentPathRegex: undefined,
+    ...options,
+  };
 }
 
 export function jestConfig<T extends jest.ProjectConfig>(
@@ -68,7 +72,7 @@ export function jestConfig<T extends jest.ProjectConfig>(
     ...options,
   } as any;
   if (tsJestOptions) {
-    res.globals['ts-jest'] = tsJestConfig(tsJestOptions);
+    res.globals['ts-jest'] = tsJestOptions;
   }
   return res;
 }

src/ts-jest-transformer.ts

@@ -18,6 +18,8 @@ import importer from './utils/importer';
 import { Errors, ImportReasons } from './utils/messages';
 
 export default class TsJestTransformer implements jest.Transformer {
+  constructor(protected _baseOptions: TsJestGlobalOptions = {}) {}
+
   @Memoize()
   get hooks(): TsJestHooksMap {
     let hooksFile = process.env.__TS_JEST_HOOKS;
@@ -58,7 +60,7 @@ export default class TsJestTransformer implements jest.Transformer {
   babelJestConfigFor(jestConfig: jest.ProjectConfig): BabelConfig | undefined {
     const config = this.configFor(jestConfig);
     const rootDir = jestRootDir(jestConfig);
-    if (config.babelJest === false) {
+    if (!config.babelJest) {
       return;
     }
 
@@ -81,9 +83,9 @@ export default class TsJestTransformer implements jest.Transformer {
     const parsedConfig = backportJestConfig(jestConfig);
     const { globals = {} } = parsedConfig as any;
     const options: TsJestGlobalOptions = { ...globals['ts-jest'] };
-    let { stringifyContentPathRegex: stringifyRegEx } = options;
 
     // stringifyContentPathRegex option
+    let { stringifyContentPathRegex: stringifyRegEx } = options;
     if (typeof stringifyRegEx === 'string') {
       try {
         stringifyRegEx = RegExp(stringifyRegEx);
@@ -108,8 +110,8 @@ export default class TsJestTransformer implements jest.Transformer {
 
     // parsed options
     return {
-      inputOptions: options,
-      babelJest: options.babelJest || false,
+      tsConfig: options.tsConfig || undefined,
+      babelJest: options.babelJest || undefined,
       diagnostics: normalizeDiagnosticTypes(options.diagnostics),
       stringifyContentPathRegex: stringifyRegEx as RegExp | undefined,
     };

src/ts-program.spec.ts

@@ -7,11 +7,7 @@ const content = fakers.typescriptSource();
 
 describe('hoisting', () => {
   describe('without babel', () => {
-    const prog = new TsProgram(resolve(__dirname, '..'), {
-      babelJest: false,
-      inputOptions: {},
-      diagnostics: [],
-    });
+    const prog = new TsProgram(resolve(__dirname, '..'), fakers.tsJestConfig());
 
     it('should hoist jest.mock() calls', () => {
       const result = prog.transpileModule(path, content, undefined, {
@@ -22,11 +18,10 @@ describe('hoisting', () => {
   });
 
   describe('with babel', () => {
-    const prog = new TsProgram(resolve(__dirname, '..'), {
-      babelJest: true,
-      inputOptions: {},
-      diagnostics: [],
-    });
+    const prog = new TsProgram(
+      resolve(__dirname, '..'),
+      fakers.tsJestConfig({ babelJest: {} }),
+    );
 
     it('should not hoist jest.mock() calls', () => {
       const result = prog.transpileModule(path, content, undefined, {

src/ts-program.ts

@@ -35,7 +35,7 @@ export default class TsProgram implements TsJestProgram {
 
   @Memoize()
   get configFile(): string | null {
-    const given = this.tsJestConfig.inputOptions.tsConfig;
+    const given = this.tsJestConfig.tsConfig;
     let resolved: string | undefined;
     if (typeof given === 'string') {
       // we got a path to a custom (or not) tsconfig
@@ -83,7 +83,7 @@ export default class TsProgram implements TsJestProgram {
     const { config, error } = configFile
       ? ts.readConfigFile(configFile, sys.readFile)
       : {
-          config: { compilerOptions: this.tsJestConfig.inputOptions.tsConfig },
+          config: { compilerOptions: this.tsJestConfig.tsConfig },
           error: undefined,
         };
     if (error) throw error; // tslint:disable-line:curly

src/types.ts

@@ -23,30 +23,21 @@ export enum DiagnosticTypes {
   global = 'global',
   semantic = 'sementic',
 }
-export enum DiagnosticSets {
-  none = 'none',
-  full = 'full',
-  default = 'default',
-}
-export const diagnosticSets = {
-  full: [
-    DiagnosticTypes.global,
-    DiagnosticTypes.syntactic,
-    DiagnosticTypes.semantic,
-    DiagnosticTypes.options,
-  ],
-  default: [DiagnosticTypes.syntactic, DiagnosticTypes.options],
-  none: [],
-};
+export type DiagnosticFilter = DiagnosticTypes[] | DiagnosticTypes;
+export type TsTransformerFactory =
+  | _ts.TransformerFactory<_ts.SourceFile>
+  | string;
 
 // FIXME: find the right typing for this
 export type BabelConfig = _babel.TransformOptions;
 
 export interface TsJestGlobalOptions {
   // either a path to a tsconfig json file, or inline compiler options
   tsConfig?: string | _ts.CompilerOptions;
+
   // what kind of diagnostics to report
-  diagnostics?: DiagnosticTypes[] | DiagnosticTypes | DiagnosticSets | boolean;
+  diagnostics?: DiagnosticFilter | boolean | undefined;
+
   // whether to use babel jest under the hood or not
   // it can be:
   //    - a path to a babelrc (<rootDir> can be used)
@@ -60,12 +51,12 @@ export interface TsJestGlobalOptions {
 }
 
 export interface TsJestConfig {
-  inputOptions: TsJestGlobalOptions;
-  babelJest: BabelConfig | string | false;
+  tsConfig: _ts.CompilerOptions | string | undefined;
+  babelJest: BabelConfig | string | undefined;
   diagnostics: DiagnosticTypes[];
 
   // to deprecate / deprecated === === ===
-  stringifyContentPathRegex?: RegExp | undefined;
+  stringifyContentPathRegex: RegExp | undefined;
 }
 
 export interface TsJestProgram {

src/utils/diagnostics.ts

@@ -1,24 +1,19 @@
-import { DiagnosticTypes, DiagnosticSets, diagnosticSets } from '../types';
+import { DiagnosticTypes, TsJestGlobalOptions, TsJestConfig } from '../types';
 import { interpolate, Errors } from './messages';
+import { inspect } from 'util';
 
 export const isDiagnosticType = (val: any): val is DiagnosticTypes => {
   return val && DiagnosticTypes[val] === val;
 };
 
-export const isDiagnosticSet = (val: any): val is DiagnosticSets => {
-  return val && DiagnosticSets[val] === val;
-};
-
 export const normalizeDiagnosticTypes = (
-  val?: DiagnosticTypes[] | DiagnosticTypes | DiagnosticSets | boolean,
+  val?: DiagnosticTypes[] | DiagnosticTypes | boolean,
 ): DiagnosticTypes[] => {
   let res!: DiagnosticTypes[];
   if (typeof val === 'string') {
     // string
     if (isDiagnosticType(val)) {
       res = [val];
-    } else if (isDiagnosticSet(val)) {
-      res = diagnosticSets[val];
     }
   } else if (Array.isArray(val)) {
     // array
@@ -30,11 +25,16 @@ export const normalizeDiagnosticTypes = (
     res = [];
   } else if (val) {
     // true
-    res = diagnosticSets.default;
+    res = [
+      DiagnosticTypes.global,
+      DiagnosticTypes.options,
+      DiagnosticTypes.semantic,
+      DiagnosticTypes.syntactic,
+    ];
   }
   if (!res) {
     throw new TypeError(
-      interpolate(Errors.InvalidDiagnosticsOption, { value: val }),
+      interpolate(Errors.InvalidDiagnosticsOption, { value: inspect(val) }),
     );
   }
   // ensure we have another instance of array with unique items

src/utils/importer.spec.ts

@@ -53,7 +53,7 @@ describe('patcher', () => {
 });
 
 describe('babelCore', () => {
-  it('should prefers babel 7', () => {
+  it('should prefer babel 7', () => {
     mockThese(['@babel/core', 'babel-core']);
     expect(importer().babelCore(fakers.importReason())).toBe('@babel/core');
   });