ts-jest 22.4.3 → 23.0.0

package/.travis.yml

@@ -1,8 +1,11 @@
 dist: trusty
 sudo: required
 language: node_js
+cache: yarn
+git:
+  depth: 5
 node_js:
-  - "9"
+  - "10"
   - "8"
   - "6"
 before_install:

package/AUTHORS

@@ -25,6 +25,7 @@ Eric Anderson <e@ericlanderson.com>
 Felipe Matos <felipems@yahoo.com.br>
 Forbes Lindesay <forbes@lindesay.co.uk>
 Gino Zhang <whitetrefoil@gmail.com>
+Gregor Stamac <1668205+gstamac@users.noreply.github.com>
 Gustav Wengel <gustavwengel@gmail.com>
 Henry Zektser <japhar81@gmail.com>
 Ihor Chulinda <ichulinda@gmail.com>

package/{collaborator-guidelines.md → COLLABORATORS.md}

@@ -11,6 +11,9 @@
 
 # Collaborator Guidelines
 
+ts-jest is grateful for all issues, PRs and contributions. In this file are tips for getting started contributing,
+and best practices, so that we can ensure that we can maintain this project in the future.
+
 ## Installing and building the project
 
 To be able to install and build the project probably, `rimraf` is required. Install `rimraf` by running
@@ -36,3 +39,19 @@ After installing `rimraf`, `yarn` command can be run normally when installing de
 ts-jest must match the major version of jest. Matching the minor version is preferred. Matching the version patch is not required.
 
 When merging PRs which fix bugs, it is preferable to increment the version patch version so that the changes can be published to NPM.
+
+## Tests
+
+All new features or bugfixes should be accompanied with a new test, to ensure that the change works as intended, and to make sure we don't inadvertently break it in the future through refactring
+
+If you are simply refactoring code, it is not needed to add a test.
+
+### How to add tests
+- Tests are added by creating a new file in tests/__tests__ 
+- A test usually consists of two parts
+	 - A directory under tests/ that have some files that should result in a specific output when jest is passed through it
+	 - A file under tests/__tests__ that uses the runJest command to run Jest on the specified directory, and makes asserts on the output of stdout and stderr
+	 	When asserting things on the output, it is common to both assert something about the exit code, and something about the output. Always assert on the output first, before asserting on the status code - as it leads to much nicer error messages when refactoring. (You get the full output text, rather than just '0 didn't equal 1')
+
+### How to run tests
+Tests are run through `yarn test`

package/README.md

@@ -33,6 +33,7 @@ ts-jest is a TypeScript preprocessor with source map support for Jest that lets
   - [Using `.babelrc`](#using-babelrc)
   - [Using a custom Babel config](#using-a-custom-babel-config)
   - [TS compiler & error reporting](#ts-compiler--error-reporting)
+  - [Ignore coverage on decorators](#ignore-coverage-on-decorators)
 - [Use cases](#use-cases)
   - [React Native](#react-native)
 - [Angular 2](#angular-2)
@@ -116,6 +117,9 @@ ts-jest tries to support that. If `allowSyntheticDefaultImports` is set to true
 to automatically create the synthetic default exports for you - nothing else needed.
 You can opt-out of this behaviour with the [skipBabel flag](#skipping-babel)
 
+**Typescript 2.7 has built-in support for this feature via the `esModuleInterop` flag. We're looking to deprecate this feature.
+Please use `esModuleInterop` instead. More details [here](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-7.html)** 
+
 ### Supports automatic of jest.mock() calls
 [Just like Jest](https://facebook.github.io/jest/docs/manual-mocks.html#using-with-es-module-imports) ts-jest
 automatically uses babel to hoist your `jest.mock()` calls to the top of your file.
@@ -233,6 +237,27 @@ If you want to enable Syntactic & Semantic TypeScript error reporting you can en
 }
 ```
 
+**Note:** This is an experimental feature, comes with no guarantees and could be removed if it causes more problems than it solves. Testing is not the place to look for type errors. That should be done separately. Moreover, ts-jest only processes the files that are passed in by jest. It doesn't read files off the disk by default which is why `enableTsDiagnostics` will hurt performance compared to the normal use case.
+
+### Ignore coverage on decorators
+
+**Note:** This is an experimental feature, comes with no guarantees and could be removed if it causes more problems than it solves
+
+If you want to ignore coverage on decorators you can enable this through `ignoreCoverageForDecorators` and `ignoreCoverageForAllDecorators` flags. If you enable the first option you have to add the `/* istanbul ignore decorator */` comment after the decorator. If you choose the second option all decorators will be ignored.
+
+```json
+{
+  "jest": {
+    "globals": {
+      "ts-jest": {
+        "ignoreCoverageForDecorators": true,
+        "ignoreCoverageForAllDecorators": true
+      }
+    }
+  }
+}
+```
+
 ## Use cases
 
 ### React Native
@@ -373,7 +398,7 @@ We suggest placing the `jest.mock()` calls after the imports, but before any act
 
 ### `const enum` is not supported
 
-This is due to a limitation in the ts-jest preprocessor which compiles each test file individually, therefore ignoring implementations of ambient declarations. The TypeScript team currently have [no plan to support const enum inlining](https://github.com/Microsoft/TypeScript/issues/5243) for this particular compiler method. See #112 and #281 for more information.
+This is due to a limitation in the ts-jest preprocessor which compiles each test file individually, therefore ignoring implementations of ambient declarations. The TypeScript team currently have [no plan to support const enum inlining](https://github.com/Microsoft/TypeScript/issues/5243) for this particular compiler method. See [#112](https://github.com/kulshekhar/ts-jest/issues/112) and [#281](https://github.com/kulshekhar/ts-jest/issues/281) for more information.
 
 One possible workaround is to manually inline usage of const enum values - i.e. in your code, use `let x: Enum = 1 as Enum` as opposed to `let x: Enum = Enum.FirstValue`. This allows you to keep the type checking on enums without running into this issue.
 

package/appveyor.yml

@@ -4,6 +4,8 @@
 # build version format
 version: "{build}"
 
+clone_depth: 5
+
 # fix lineendings in Windows
 init:
   - git config --global core.autocrlf input
@@ -14,7 +16,7 @@ environment:
   matrix:
     - nodejs_version: 6
     - nodejs_version: 8
-    - nodejs_version: 9
+    - nodejs_version: 10
 
 # get the latest stable version of Node 0.STABLE.latest
 install:
@@ -26,6 +28,9 @@ install:
 
 build: off
 
+cache:
+  - "%LOCALAPPDATA%\\Yarn"
+
 test_script:
   - node --version
   - npm --version

package/dist/jest-types.d.ts

@@ -16,9 +16,9 @@ export interface HasteConfig {
 export interface BabelTransformOptions extends BabelTransformOpts {
     cacheDirectory?: string;
 }
-export declare type PostProcessHook = (src: string, filename: string, config: JestConfig, transformOptions: TransformOptions) => string;
-export declare type JestConfig = Partial<FullJestConfig>;
-export interface FullJestConfig {
+export declare type PostProcessHook = (codeSourcemapPair: CodeSourceMapPair, filePath: string, config: JestConfig, transformOptions: TransformOptions) => CodeSourceMapPair;
+export declare type JestConfig = Partial<FullJestProjectConfig>;
+export interface FullJestProjectConfig {
     automock: boolean;
     browser: boolean;
     cache: boolean;
@@ -27,7 +27,10 @@ export interface FullJestConfig {
     coveragePathIgnorePatterns: string[];
     cwd: Path;
     detectLeaks: boolean;
+    detectOpenHandles: boolean;
     displayName: string | null;
+    errorOnDeprecated: boolean;
+    filter: Path | null;
     forceCoverageMatch: Glob[];
     globals: ConfigGlobals;
     haste: HasteConfig;
@@ -47,6 +50,7 @@ export interface FullJestConfig {
     runner: string;
     setupFiles: Path[];
     setupTestFrameworkScriptFile: Path | null;
+    skipFilter: boolean;
     skipNodeResolution: boolean;
     snapshotSerializers: Path[];
     testEnvironment: string;
@@ -71,4 +75,15 @@ export interface TsJestConfig {
     enableInternalCache?: boolean;
     enableTsDiagnostics?: boolean;
     disableSourceMapSupport?: boolean;
+    ignoreCoverageForDecorators?: boolean;
+    ignoreCoverageForAllDecorators?: boolean;
+    useExperimentalLanguageServer?: boolean;
+}
+export interface JestConfigNormalize {
+    hasDeprecationWarnings: boolean;
+    options: FullJestProjectConfig;
+}
+export interface CodeSourceMapPair {
+    code: string;
+    map: string;
 }

package/dist/logger.js

@@ -4,8 +4,9 @@ var fs = require("fs");
 var path = require("path");
 var logs = [];
 var logsFlushed = false;
+var outputToConsole = false;
 function shouldLog() {
-    return process.env.TS_JEST_DEBUG && !logsFlushed;
+    return (process.env.TS_JEST_DEBUG || outputToConsole) && !logsFlushed;
 }
 function logOnce() {
     var thingsToLog = [];
@@ -27,12 +28,14 @@ function flushLogs() {
     var JSONifiedLogs = logs.map(convertToJSONIfPossible);
     var logString = JSONifiedLogs.join('\n');
     var filePath = path.resolve(rootPath, 'debug.txt');
-    fs.writeFileSync(filePath, logString);
+    if (outputToConsole) {
+        console.log(logString);
+    }
+    else {
+        fs.writeFileSync(filePath, logString);
+    }
 }
 exports.flushLogs = flushLogs;
-function includes(array, subject) {
-    return array.indexOf(subject) !== -1;
-}
 function convertToJSONIfPossible(object) {
     try {
         return JSON.stringify(object, null, 2);
@@ -41,4 +44,4 @@ function convertToJSONIfPossible(object) {
         return object.toString();
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHVCQUF5QjtBQUN6QiwyQkFBNkI7QUFRN0IsSUFBTSxJQUFJLEdBQVUsRUFBRSxDQUFDO0FBQ3ZCLElBQUksV0FBVyxHQUFZLEtBQUssQ0FBQztBQUVqQztJQUVFLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsSUFBSSxDQUFDLFdBQVcsQ0FBQztBQUNuRCxDQUFDO0FBR0Q7SUFBd0IscUJBQXFCO1NBQXJCLFVBQXFCLEVBQXJCLHFCQUFxQixFQUFyQixJQUFxQjtRQUFyQixnQ0FBcUI7O0lBQzNDLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2pCLE1BQU0sQ0FBQztJQUNULENBQUM7SUFDRCxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQ3pCLENBQUM7QUFMRCwwQkFLQztBQUdEO0lBQ0UsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDakIsTUFBTSxDQUFDO0lBQ1QsQ0FBQztJQUNELFdBQVcsR0FBRyxJQUFJLENBQUM7SUFDbkIsSUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDaEQsSUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0lBQ3hELElBQU0sU0FBUyxHQUFHLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDM0MsSUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDckQsRUFBRSxDQUFDLGFBQWEsQ0FBQyxRQUFRLEVBQUUsU0FBUyxDQUFDLENBQUM7QUFDeEMsQ0FBQztBQVZELDhCQVVDO0FBRUQsa0JBQXFCLEtBQVUsRUFBRSxPQUFVO0lBQ3pDLE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO0FBQ3ZDLENBQUM7QUFFRCxpQ0FBaUMsTUFBVztJQUMxQyxJQUFJLENBQUM7UUFDSCxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFBQyxLQUFLLENBQUMsQ0FBQyxJQUFELENBQUM7UUFDUCxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzNCLENBQUM7QUFDSCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHVCQUF5QjtBQUN6QiwyQkFBNkI7QUFRN0IsSUFBTSxJQUFJLEdBQVUsRUFBRSxDQUFDO0FBQ3ZCLElBQUksV0FBVyxHQUFZLEtBQUssQ0FBQztBQUVqQyxJQUFNLGVBQWUsR0FBWSxLQUFLLENBQUM7QUFFdkM7SUFFRSxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLElBQUksZUFBZSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUM7QUFDeEUsQ0FBQztBQUdEO0lBQXdCLHFCQUFxQjtTQUFyQixVQUFxQixFQUFyQixxQkFBcUIsRUFBckIsSUFBcUI7UUFBckIsZ0NBQXFCOztJQUMzQyxJQUFJLENBQUMsU0FBUyxFQUFFLEVBQUU7UUFDaEIsT0FBTztLQUNSO0lBQ0QsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUN6QixDQUFDO0FBTEQsMEJBS0M7QUFHRDtJQUNFLElBQUksQ0FBQyxTQUFTLEVBQUUsRUFBRTtRQUNoQixPQUFPO0tBQ1I7SUFDRCxXQUFXLEdBQUcsSUFBSSxDQUFDO0lBQ25CLElBQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQ2hELElBQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUN4RCxJQUFNLFNBQVMsR0FBRyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzNDLElBQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3JELElBQUksZUFBZSxFQUFFO1FBRW5CLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUM7S0FDeEI7U0FBTTtRQUNMLEVBQUUsQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0tBQ3ZDO0FBQ0gsQ0FBQztBQWZELDhCQWVDO0FBRUQsaUNBQWlDLE1BQVc7SUFDMUMsSUFBSTtRQUNGLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0tBQ3hDO0lBQUMsV0FBTTtRQUNOLE9BQU8sTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDO0tBQzFCO0FBQ0gsQ0FBQyJ9

package/dist/postprocess.d.ts

@@ -1,3 +1,5 @@
+import * as ts from 'typescript';
 import { CompilerOptions } from 'typescript/lib/typescript';
-import { FullJestConfig, PostProcessHook, TsJestConfig } from './jest-types';
-export declare const getPostProcessHook: (tsCompilerOptions: CompilerOptions, jestConfig: Partial<FullJestConfig>, tsJestConfig: TsJestConfig) => PostProcessHook;
+import { CodeSourceMapPair, FullJestProjectConfig, JestConfig, PostProcessHook, TransformOptions, TsJestConfig } from './jest-types';
+export declare function postProcessCode(compilerOptions: CompilerOptions, jestConfig: JestConfig, tsJestConfig: TsJestConfig, transformOptions: TransformOptions, transpileOutput: CodeSourceMapPair, filePath: string): CodeSourceMapPair;
+export declare const getPostProcessHook: (tsCompilerOptions: ts.CompilerOptions, jestConfig: Partial<FullJestProjectConfig>, tsJestConfig: TsJestConfig) => PostProcessHook;

package/dist/postprocess.js

@@ -8,21 +8,35 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var babel = require("babel-core");
-var babel_plugin_istanbul_1 = require("babel-plugin-istanbul");
-var jestPreset = require("babel-preset-jest");
+var babel;
+var istanbulPlugin;
+var jestPreset;
+function importBabelDeps() {
+    if (babel) {
+        return;
+    }
+    babel = require('babel-core');
+    istanbulPlugin = require('babel-plugin-istanbul').default;
+    jestPreset = require('babel-preset-jest');
+}
 var logger_1 = require("./logger");
+function postProcessCode(compilerOptions, jestConfig, tsJestConfig, transformOptions, transpileOutput, filePath) {
+    var postHook = exports.getPostProcessHook(compilerOptions, jestConfig, tsJestConfig);
+    return postHook(transpileOutput, filePath, jestConfig, transformOptions);
+}
+exports.postProcessCode = postProcessCode;
 function createBabelTransformer(options) {
-    options = __assign({}, options, { plugins: options.plugins || [], presets: (options.presets || []).concat([jestPreset]), retainLines: true, sourceMaps: 'inline' });
+    importBabelDeps();
+    options = __assign({}, options, { plugins: options.plugins || [], presets: (options.presets || []).concat([jestPreset]) });
     delete options.cacheDirectory;
     delete options.filename;
-    return function (src, filename, config, transformOptions) {
-        var theseOptions = Object.assign({ filename: filename }, options);
+    return function (codeSourcemapPair, filename, config, transformOptions) {
+        var theseOptions = Object.assign({ filename: filename, inputSourceMap: codeSourcemapPair.map }, options);
         if (transformOptions && transformOptions.instrument) {
             theseOptions.auxiliaryCommentBefore = ' istanbul ignore next ';
             theseOptions.plugins = theseOptions.plugins.concat([
                 [
-                    babel_plugin_istanbul_1.default,
+                    istanbulPlugin,
                     {
                         cwd: config.rootDir,
                         exclude: [],
@@ -30,20 +44,17 @@ function createBabelTransformer(options) {
                 ],
             ]);
         }
-        return babel.transform(src, theseOptions).code;
+        return babel.transform(codeSourcemapPair.code, theseOptions);
     };
 }
 exports.getPostProcessHook = function (tsCompilerOptions, jestConfig, tsJestConfig) {
     if (tsJestConfig.skipBabel) {
         logger_1.logOnce('Not using any postprocess hook.');
-        return function (src) { return src; };
+        return function (input) { return input; };
     }
     var plugins = Array.from((tsJestConfig.babelConfig && tsJestConfig.babelConfig.plugins) || []);
-    if (tsCompilerOptions.allowSyntheticDefaultImports) {
-        plugins.push('transform-es2015-modules-commonjs');
-    }
-    var babelOptions = __assign({}, tsJestConfig.babelConfig, { babelrc: tsJestConfig.useBabelrc || false, plugins: plugins, presets: tsJestConfig.babelConfig ? tsJestConfig.babelConfig.presets : [] });
+    var babelOptions = __assign({}, tsJestConfig.babelConfig, { babelrc: tsJestConfig.useBabelrc || false, plugins: plugins, presets: tsJestConfig.babelConfig ? tsJestConfig.babelConfig.presets : [], sourceMaps: tsJestConfig.disableSourceMapSupport !== true });
     logger_1.logOnce('Using babel with options:', babelOptions);
     return createBabelTransformer(babelOptions);
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9zdHByb2Nlc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcG9zdHByb2Nlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUlBLGtDQUFvQztBQUNwQywrREFBbUQ7QUFDbkQsOENBQWdEO0FBVWhELG1DQUFtQztBQUVuQyxnQ0FBZ0MsT0FBOEI7SUFDNUQsT0FBTyxnQkFDRixPQUFPLElBQ1YsT0FBTyxFQUFFLE9BQU8sQ0FBQyxPQUFPLElBQUksRUFBRSxFQUM5QixPQUFPLEVBQUUsQ0FBQyxPQUFPLENBQUMsT0FBTyxJQUFJLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLEVBR3JELFdBQVcsRUFBRSxJQUFJLEVBR2pCLFVBQVUsRUFBRSxRQUFRLEdBQ3JCLENBQUM7SUFDRixPQUFPLE9BQU8sQ0FBQyxjQUFjLENBQUM7SUFDOUIsT0FBTyxPQUFPLENBQUMsUUFBUSxDQUFDO0lBRXhCLE1BQU0sQ0FBQyxVQUNMLEdBQVcsRUFDWCxRQUFnQixFQUNoQixNQUFrQixFQUNsQixnQkFBa0M7UUFFbEMsSUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFFBQVEsVUFBQSxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDMUQsRUFBRSxDQUFDLENBQUMsZ0JBQWdCLElBQUksZ0JBQWdCLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztZQUNwRCxZQUFZLENBQUMsc0JBQXNCLEdBQUcsd0JBQXdCLENBQUM7WUFFL0QsWUFBWSxDQUFDLE9BQU8sR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQztnQkFDakQ7b0JBQ0UsK0JBQWM7b0JBQ2Q7d0JBRUUsR0FBRyxFQUFFLE1BQU0sQ0FBQyxPQUFPO3dCQUNuQixPQUFPLEVBQUUsRUFBRTtxQkFDWjtpQkFDRjthQUNGLENBQUMsQ0FBQztRQUNMLENBQUM7UUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsWUFBWSxDQUFDLENBQUMsSUFBSSxDQUFDO0lBQ2pELENBQUMsQ0FBQztBQUNKLENBQUM7QUFFWSxRQUFBLGtCQUFrQixHQUFHLFVBQ2hDLGlCQUFrQyxFQUNsQyxVQUFzQixFQUN0QixZQUEwQjtJQUUxQixFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztRQUMzQixnQkFBTyxDQUFDLGlDQUFpQyxDQUFDLENBQUM7UUFDM0MsTUFBTSxDQUFDLFVBQUEsR0FBRyxJQUFJLE9BQUEsR0FBRyxFQUFILENBQUcsQ0FBQztJQUNwQixDQUFDO0lBRUQsSUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FDeEIsQ0FBQyxZQUFZLENBQUMsV0FBVyxJQUFJLFlBQVksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUNyRSxDQUFDO0lBRUYsRUFBRSxDQUFDLENBQUMsaUJBQWlCLENBQUMsNEJBQTRCLENBQUMsQ0FBQyxDQUFDO1FBQ25ELE9BQU8sQ0FBQyxJQUFJLENBQUMsbUNBQW1DLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRUQsSUFBTSxZQUFZLGdCQUNiLFlBQVksQ0FBQyxXQUFXLElBQzNCLE9BQU8sRUFBRSxZQUFZLENBQUMsVUFBVSxJQUFJLEtBQUssRUFDekMsT0FBTyxTQUFBLEVBQ1AsT0FBTyxFQUFFLFlBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQzFFLENBQUM7SUFFRixnQkFBTyxDQUFDLDJCQUEyQixFQUFFLFlBQVksQ0FBQyxDQUFDO0lBRW5ELE1BQU0sQ0FBQyxzQkFBc0IsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUM5QyxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9zdHByb2Nlc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcG9zdHByb2Nlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQVFBLElBQUksS0FBNEIsQ0FBQztBQUNqQyxJQUFJLGNBQThDLENBQUM7QUFDbkQsSUFBSSxVQUFzQyxDQUFDO0FBQzNDO0lBQ0UsSUFBSSxLQUFLLEVBQUU7UUFDVCxPQUFPO0tBQ1I7SUFDRCxLQUFLLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzlCLGNBQWMsR0FBRyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBQyxPQUFPLENBQUM7SUFDMUQsVUFBVSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0FBQzVDLENBQUM7QUFXRCxtQ0FBbUM7QUFJbkMseUJBQ0UsZUFBZ0MsRUFDaEMsVUFBc0IsRUFDdEIsWUFBMEIsRUFDMUIsZ0JBQWtDLEVBQ2xDLGVBQWtDLEVBQ2xDLFFBQWdCO0lBRWhCLElBQU0sUUFBUSxHQUFHLDBCQUFrQixDQUNqQyxlQUFlLEVBQ2YsVUFBVSxFQUNWLFlBQVksQ0FDYixDQUFDO0lBRUYsT0FBTyxRQUFRLENBQUMsZUFBZSxFQUFFLFFBQVEsRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztBQUMzRSxDQUFDO0FBZkQsMENBZUM7QUFFRCxnQ0FDRSxPQUE4QjtJQUU5QixlQUFlLEVBQUUsQ0FBQztJQUNsQixPQUFPLGdCQUNGLE9BQU8sSUFDVixPQUFPLEVBQUUsT0FBTyxDQUFDLE9BQU8sSUFBSSxFQUFFLEVBQzlCLE9BQU8sRUFBRSxDQUFDLE9BQU8sQ0FBQyxPQUFPLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsR0FDdEQsQ0FBQztJQUNGLE9BQU8sT0FBTyxDQUFDLGNBQWMsQ0FBQztJQUM5QixPQUFPLE9BQU8sQ0FBQyxRQUFRLENBQUM7SUFFeEIsT0FBTyxVQUNMLGlCQUFvQyxFQUNwQyxRQUFnQixFQUNoQixNQUFrQixFQUNsQixnQkFBa0M7UUFFbEMsSUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FDaEMsRUFBRSxRQUFRLFVBQUEsRUFBRSxjQUFjLEVBQUUsaUJBQWlCLENBQUMsR0FBRyxFQUFFLEVBQ25ELE9BQU8sQ0FDUixDQUFDO1FBQ0YsSUFBSSxnQkFBZ0IsSUFBSSxnQkFBZ0IsQ0FBQyxVQUFVLEVBQUU7WUFDbkQsWUFBWSxDQUFDLHNCQUFzQixHQUFHLHdCQUF3QixDQUFDO1lBRS9ELFlBQVksQ0FBQyxPQUFPLEdBQUcsWUFBWSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUM7Z0JBQ2pEO29CQUNFLGNBQWM7b0JBQ2Q7d0JBRUUsR0FBRyxFQUFFLE1BQU0sQ0FBQyxPQUFPO3dCQUNuQixPQUFPLEVBQUUsRUFBRTtxQkFDWjtpQkFDRjthQUNGLENBQUMsQ0FBQztTQUNKO1FBRUQsT0FBUSxLQUFLLENBQUMsU0FBUyxDQUNyQixpQkFBaUIsQ0FBQyxJQUFJLEVBQ3RCLFlBQVksQ0FDZ0IsQ0FBQztJQUNqQyxDQUFDLENBQUM7QUFDSixDQUFDO0FBRVksUUFBQSxrQkFBa0IsR0FBRyxVQUNoQyxpQkFBa0MsRUFDbEMsVUFBc0IsRUFDdEIsWUFBMEI7SUFFMUIsSUFBSSxZQUFZLENBQUMsU0FBUyxFQUFFO1FBQzFCLGdCQUFPLENBQUMsaUNBQWlDLENBQUMsQ0FBQztRQUUzQyxPQUFPLFVBQUEsS0FBSyxJQUFJLE9BQUEsS0FBSyxFQUFMLENBQUssQ0FBQztLQUN2QjtJQUVELElBQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQ3hCLENBQUMsWUFBWSxDQUFDLFdBQVcsSUFBSSxZQUFZLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FDckUsQ0FBQztJQUVGLElBQU0sWUFBWSxnQkFDYixZQUFZLENBQUMsV0FBVyxJQUMzQixPQUFPLEVBQUUsWUFBWSxDQUFDLFVBQVUsSUFBSSxLQUFLLEVBQ3pDLE9BQU8sU0FBQSxFQUNQLE9BQU8sRUFBRSxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUN6RSxVQUFVLEVBQUUsWUFBWSxDQUFDLHVCQUF1QixLQUFLLElBQUksR0FDMUQsQ0FBQztJQUVGLGdCQUFPLENBQUMsMkJBQTJCLEVBQUUsWUFBWSxDQUFDLENBQUM7SUFFbkQsT0FBTyxzQkFBc0IsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUM5QyxDQUFDLENBQUMifQ==

package/dist/preprocessor.d.ts

@@ -1,3 +1,3 @@
-import { JestConfig, Path, TransformOptions } from './jest-types';
-export declare function process(src: string, filePath: Path, jestConfig: JestConfig, transformOptions?: TransformOptions): string;
+import { CodeSourceMapPair, JestConfig, Path, TransformOptions } from './jest-types';
+export declare function process(src: string, filePath: Path, jestConfig: JestConfig, transformOptions?: TransformOptions): CodeSourceMapPair | string;
 export declare function getCacheKey(fileData: string, filePath: Path, jestConfigStr: string, transformOptions?: TransformOptions): string;

package/dist/preprocessor.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var crypto = require("crypto");
-var tsc = require("typescript");
 var logger_1 = require("./logger");
 var postprocess_1 = require("./postprocess");
 var utils_1 = require("./utils");
+var transpiler_1 = require("./transpiler");
 function process(src, filePath, jestConfig, transformOptions) {
     if (transformOptions === void 0) { transformOptions = { instrument: false }; }
-    var compilerOptions = utils_1.getTSConfig(jestConfig.globals, jestConfig.rootDir, transformOptions.instrument);
+    var compilerOptions = utils_1.getTSConfig(jestConfig.globals, jestConfig.rootDir);
     logger_1.logOnce('final compilerOptions:', compilerOptions);
     var isTsFile = /\.tsx?$/.test(filePath);
     var isJsFile = /\.jsx?$/.test(filePath);
@@ -24,23 +24,22 @@ function process(src, filePath, jestConfig, transformOptions) {
     if (tsJestConfig.enableTsDiagnostics) {
         utils_1.runTsDiagnostics(filePath, compilerOptions);
     }
-    var tsTranspiled = tsc.transpileModule(src, {
-        compilerOptions: compilerOptions,
-        fileName: filePath,
-    });
-    var postHook = postprocess_1.getPostProcessHook(compilerOptions, jestConfig, tsJestConfig);
-    var outputText = postHook(tsTranspiled.outputText, filePath, jestConfig, transformOptions);
-    var modified = tsJestConfig.disableSourceMapSupport === true
-        ? outputText
-        : utils_1.injectSourcemapHook(filePath, tsTranspiled.outputText, outputText);
+    var transpileOutput = transpiler_1.transpileTypescript(filePath, src, compilerOptions);
+    if (tsJestConfig.ignoreCoverageForAllDecorators === true) {
+        transpileOutput.code = transpileOutput.code.replace(/__decorate/g, '/* istanbul ignore next */__decorate');
+    }
+    if (tsJestConfig.ignoreCoverageForDecorators === true) {
+        transpileOutput.code = transpileOutput.code.replace(/(__decorate\(\[\r?\n[^\n\r]*)\/\*\s*istanbul\s*ignore\s*decorator(.*)\*\//g, '/* istanbul ignore next$2*/$1');
+    }
+    var outputText = postprocess_1.postProcessCode(compilerOptions, jestConfig, tsJestConfig, transformOptions, transpileOutput, filePath);
     logger_1.flushLogs();
-    return modified;
+    return { code: outputText.code, map: outputText.map };
 }
 exports.process = process;
 function getCacheKey(fileData, filePath, jestConfigStr, transformOptions) {
     if (transformOptions === void 0) { transformOptions = { instrument: false }; }
     var jestConfig = JSON.parse(jestConfigStr);
-    var tsConfig = utils_1.getTSConfig(jestConfig.globals, jestConfig.rootDir, transformOptions.instrument);
+    var tsConfig = utils_1.getTSConfig(jestConfig.globals, jestConfig.rootDir);
     return crypto
         .createHash('md5')
         .update(JSON.stringify(tsConfig), 'utf8')
@@ -49,4 +48,4 @@ function getCacheKey(fileData, filePath, jestConfigStr, transformOptions) {
         .digest('hex');
 }
 exports.getCacheKey = getCacheKey;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcHJvY2Vzc29yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3ByZXByb2Nlc3Nvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLCtCQUFpQztBQUNqQyxnQ0FBa0M7QUFFbEMsbUNBQThDO0FBQzlDLDZDQUFtRDtBQUNuRCxpQ0FNaUI7QUFFakIsaUJBQ0UsR0FBVyxFQUNYLFFBQWMsRUFDZCxVQUFzQixFQUN0QixnQkFBMEQ7SUFBMUQsaUNBQUEsRUFBQSxxQkFBdUMsVUFBVSxFQUFFLEtBQUssRUFBRTtJQUkxRCxJQUFNLGVBQWUsR0FBRyxtQkFBVyxDQUNqQyxVQUFVLENBQUMsT0FBTyxFQUNsQixVQUFVLENBQUMsT0FBTyxFQUNsQixnQkFBZ0IsQ0FBQyxVQUFVLENBQzVCLENBQUM7SUFFRixnQkFBTyxDQUFDLHdCQUF3QixFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBRW5ELElBQU0sUUFBUSxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDMUMsSUFBTSxRQUFRLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUMxQyxJQUFNLFVBQVUsR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBRzVDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsSUFBSSxVQUFVLENBQUMsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztRQUN4RCxHQUFHLEdBQUcsa0JBQWtCLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQztJQUN4QyxDQUFDO0lBRUQsSUFBTSxXQUFXLEdBQ2YsZUFBZSxDQUFDLE9BQU8sS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsSUFBSSxRQUFRLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQztJQUVyRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFDakIsTUFBTSxDQUFDLEdBQUcsQ0FBQztJQUNiLENBQUM7SUFFRCxJQUFNLFlBQVksR0FBRyx1QkFBZSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN6RCxnQkFBTyxDQUFDLGdCQUFnQixFQUFFLFlBQVksQ0FBQyxDQUFDO0lBRXhDLEVBQUUsQ0FBQyxDQUFDLFlBQVksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUM7UUFDckMsd0JBQWdCLENBQUMsUUFBUSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRCxJQUFNLFlBQVksR0FBRyxHQUFHLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRTtRQUM1QyxlQUFlLGlCQUFBO1FBQ2YsUUFBUSxFQUFFLFFBQVE7S0FDbkIsQ0FBQyxDQUFDO0lBRUgsSUFBTSxRQUFRLEdBQUcsZ0NBQWtCLENBQ2pDLGVBQWUsRUFDZixVQUFVLEVBQ1YsWUFBWSxDQUNiLENBQUM7SUFFRixJQUFNLFVBQVUsR0FBRyxRQUFRLENBQ3pCLFlBQVksQ0FBQyxVQUFVLEVBQ3ZCLFFBQVEsRUFDUixVQUFVLEVBQ1YsZ0JBQWdCLENBQ2pCLENBQUM7SUFFRixJQUFNLFFBQVEsR0FDWixZQUFZLENBQUMsdUJBQXVCLEtBQUssSUFBSTtRQUMzQyxDQUFDLENBQUMsVUFBVTtRQUNaLENBQUMsQ0FBQywyQkFBbUIsQ0FBQyxRQUFRLEVBQUUsWUFBWSxDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUV6RSxrQkFBUyxFQUFFLENBQUM7SUFFWixNQUFNLENBQUMsUUFBUSxDQUFDO0FBQ2xCLENBQUM7QUFqRUQsMEJBaUVDO0FBRUQscUJBQ0UsUUFBZ0IsRUFDaEIsUUFBYyxFQUNkLGFBQXFCLEVBQ3JCLGdCQUEwRDtJQUExRCxpQ0FBQSxFQUFBLHFCQUF1QyxVQUFVLEVBQUUsS0FBSyxFQUFFO0lBRTFELElBQU0sVUFBVSxHQUFlLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7SUFFekQsSUFBTSxRQUFRLEdBQUcsbUJBQVcsQ0FDMUIsVUFBVSxDQUFDLE9BQU8sRUFDbEIsVUFBVSxDQUFDLE9BQU8sRUFDbEIsZ0JBQWdCLENBQUMsVUFBVSxDQUM1QixDQUFDO0lBRUYsTUFBTSxDQUFDLE1BQU07U0FDVixVQUFVLENBQUMsS0FBSyxDQUFDO1NBQ2pCLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztTQUN4QyxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztTQUNoRCxNQUFNLENBQUMsUUFBUSxHQUFHLFFBQVEsR0FBRyxhQUFhLEVBQUUsTUFBTSxDQUFDO1NBQ25ELE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUNuQixDQUFDO0FBcEJELGtDQW9CQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcHJvY2Vzc29yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3ByZXByb2Nlc3Nvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLCtCQUFpQztBQVFqQyxtQ0FBOEM7QUFDOUMsNkNBQWdEO0FBQ2hELGlDQUF5RTtBQUN6RSwyQ0FBbUQ7QUFFbkQsaUJBQ0UsR0FBVyxFQUNYLFFBQWMsRUFDZCxVQUFzQixFQUN0QixnQkFBMEQ7SUFBMUQsaUNBQUEsRUFBQSxxQkFBdUMsVUFBVSxFQUFFLEtBQUssRUFBRTtJQUkxRCxJQUFNLGVBQWUsR0FBRyxtQkFBVyxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRTVFLGdCQUFPLENBQUMsd0JBQXdCLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFFbkQsSUFBTSxRQUFRLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUMxQyxJQUFNLFFBQVEsR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzFDLElBQU0sVUFBVSxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFHNUMsSUFBSSxVQUFVLElBQUksVUFBVSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRTtRQUN2RCxHQUFHLEdBQUcsa0JBQWtCLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQztLQUN2QztJQUVELElBQU0sV0FBVyxHQUNmLGVBQWUsQ0FBQyxPQUFPLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQyxRQUFRLElBQUksUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUM7SUFFckUsSUFBSSxDQUFDLFdBQVcsRUFBRTtRQUNoQixPQUFPLEdBQUcsQ0FBQztLQUNaO0lBRUQsSUFBTSxZQUFZLEdBQUcsdUJBQWUsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDekQsZ0JBQU8sQ0FBQyxnQkFBZ0IsRUFBRSxZQUFZLENBQUMsQ0FBQztJQUl4QyxJQUFJLFlBQVksQ0FBQyxtQkFBbUIsRUFBRTtRQUNwQyx3QkFBZ0IsQ0FBQyxRQUFRLEVBQUUsZUFBZSxDQUFDLENBQUM7S0FDN0M7SUFFRCxJQUFNLGVBQWUsR0FBRyxnQ0FBbUIsQ0FBQyxRQUFRLEVBQUUsR0FBRyxFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBRTVFLElBQUksWUFBWSxDQUFDLDhCQUE4QixLQUFLLElBQUksRUFBRTtRQUN4RCxlQUFlLENBQUMsSUFBSSxHQUFHLGVBQWUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUNqRCxhQUFhLEVBQ2Isc0NBQXNDLENBQ3ZDLENBQUM7S0FDSDtJQUNELElBQUksWUFBWSxDQUFDLDJCQUEyQixLQUFLLElBQUksRUFBRTtRQUNyRCxlQUFlLENBQUMsSUFBSSxHQUFHLGVBQWUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUNqRCw0RUFBNEUsRUFDNUUsK0JBQStCLENBQ2hDLENBQUM7S0FDSDtJQUVELElBQU0sVUFBVSxHQUFHLDZCQUFlLENBQ2hDLGVBQWUsRUFDZixVQUFVLEVBQ1YsWUFBWSxFQUNaLGdCQUFnQixFQUNoQixlQUFlLEVBQ2YsUUFBUSxDQUNULENBQUM7SUFFRixrQkFBUyxFQUFFLENBQUM7SUFFWixPQUFPLEVBQUUsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQztBQUN4RCxDQUFDO0FBaEVELDBCQWdFQztBQUtELHFCQUNFLFFBQWdCLEVBQ2hCLFFBQWMsRUFDZCxhQUFxQixFQUNyQixnQkFBMEQ7SUFBMUQsaUNBQUEsRUFBQSxxQkFBdUMsVUFBVSxFQUFFLEtBQUssRUFBRTtJQUUxRCxJQUFNLFVBQVUsR0FBZSxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBRXpELElBQU0sUUFBUSxHQUFHLG1CQUFXLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFckUsT0FBTyxNQUFNO1NBQ1YsVUFBVSxDQUFDLEtBQUssQ0FBQztTQUNqQixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsRUFBRSxNQUFNLENBQUM7U0FDeEMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLENBQUM7U0FDaEQsTUFBTSxDQUFDLFFBQVEsR0FBRyxRQUFRLEdBQUcsYUFBYSxFQUFFLE1BQU0sQ0FBQztTQUNuRCxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDbkIsQ0FBQztBQWhCRCxrQ0FnQkMifQ==

package/dist/transpile-if-ts.d.ts

@@ -1 +1,2 @@
-export declare function transpileIfTypescript(path: any, contents: any, config?: any, rootDir?: string): any;
+import { ConfigGlobals } from './jest-types';
+export declare function transpileIfTypescript(path: string, contents: string, config?: ConfigGlobals, rootDir?: string): string;

package/dist/transpile-if-ts.js

@@ -6,7 +6,7 @@ function transpileIfTypescript(path, contents, config, rootDir) {
     if (rootDir === void 0) { rootDir = ''; }
     if (path && (path.endsWith('.tsx') || path.endsWith('.ts'))) {
         var transpiled = tsc.transpileModule(contents, {
-            compilerOptions: utils_1.getTSConfig(config || utils_1.mockGlobalTSConfigSchema(global), rootDir, true),
+            compilerOptions: utils_1.getTSConfig(config || utils_1.mockGlobalTSConfigSchema(global), rootDir),
             fileName: path,
         });
         return transpiled.outputText;
@@ -14,4 +14,4 @@ function transpileIfTypescript(path, contents, config, rootDir) {
     return contents;
 }
 exports.transpileIfTypescript = transpileIfTypescript;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNwaWxlLWlmLXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3RyYW5zcGlsZS1pZi10cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGdDQUFrQztBQUNsQyxpQ0FBZ0U7QUFFaEUsK0JBQ0UsSUFBSSxFQUNKLFFBQVEsRUFDUixNQUFPLEVBQ1AsT0FBb0I7SUFBcEIsd0JBQUEsRUFBQSxZQUFvQjtJQUVwQixFQUFFLENBQUMsQ0FBQyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDNUQsSUFBTSxVQUFVLEdBQUcsR0FBRyxDQUFDLGVBQWUsQ0FBQyxRQUFRLEVBQUU7WUFDL0MsZUFBZSxFQUFFLG1CQUFXLENBQzFCLE1BQU0sSUFBSSxnQ0FBd0IsQ0FBQyxNQUFNLENBQUMsRUFDMUMsT0FBTyxFQUNQLElBQUksQ0FDTDtZQUNELFFBQVEsRUFBRSxJQUFJO1NBQ2YsQ0FBQyxDQUFDO1FBRUgsTUFBTSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7SUFDL0IsQ0FBQztJQUNELE1BQU0sQ0FBQyxRQUFRLENBQUM7QUFDbEIsQ0FBQztBQW5CRCxzREFtQkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNwaWxlLWlmLXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3RyYW5zcGlsZS1pZi10cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGdDQUFrQztBQUNsQyxpQ0FBZ0U7QUFHaEUsK0JBQ0UsSUFBWSxFQUNaLFFBQWdCLEVBQ2hCLE1BQXNCLEVBQ3RCLE9BQW9CO0lBQXBCLHdCQUFBLEVBQUEsWUFBb0I7SUFFcEIsSUFBSSxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtRQUMzRCxJQUFNLFVBQVUsR0FBRyxHQUFHLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRTtZQUMvQyxlQUFlLEVBQUUsbUJBQVcsQ0FDMUIsTUFBTSxJQUFJLGdDQUF3QixDQUFDLE1BQU0sQ0FBQyxFQUMxQyxPQUFPLENBQ1I7WUFDRCxRQUFRLEVBQUUsSUFBSTtTQUNmLENBQUMsQ0FBQztRQUVILE9BQU8sVUFBVSxDQUFDLFVBQVUsQ0FBQztLQUM5QjtJQUNELE9BQU8sUUFBUSxDQUFDO0FBQ2xCLENBQUM7QUFsQkQsc0RBa0JDIn0=

package/dist/transpiler.d.ts

@@ -0,0 +1,3 @@
+import * as ts from 'typescript';
+import { CodeSourceMapPair } from './jest-types';
+export declare function transpileTypescript(filePath: string, fileSrc: string, compilerOptions: ts.CompilerOptions): CodeSourceMapPair;

package/dist/transpiler.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var ts = require("typescript");
+var logger_1 = require("./logger");
+function transpileTypescript(filePath, fileSrc, compilerOptions) {
+    logger_1.logOnce('Compiling via normal transpileModule call');
+    var transpileOutput = transpileViaTranspileModule(filePath, fileSrc, compilerOptions);
+    return {
+        code: transpileOutput.outputText,
+        map: transpileOutput.sourceMapText,
+    };
+}
+exports.transpileTypescript = transpileTypescript;
+function transpileViaTranspileModule(filePath, fileSource, compilerOptions) {
+    var transpileOutput = ts.transpileModule(fileSource, {
+        compilerOptions: compilerOptions,
+        fileName: filePath,
+        reportDiagnostics: true,
+    });
+    var diagnostics = transpileOutput.diagnostics;
+    if (diagnostics.length > 0) {
+        var errors = formatDiagnostics(diagnostics);
+        logger_1.logOnce(logMessageForTranspilationErrors(errors));
+        throw createTranspilationError(errors);
+    }
+    return transpileOutput;
+}
+function formatDiagnostics(diagnostics) {
+    return diagnostics.map(function (d) { return d.messageText; }) + "\n";
+}
+function createTranspilationError(errors) {
+    return Error("TypeScript compiler encountered syntax errors while transpiling. Errors: " + errors);
+}
+function logMessageForTranspilationErrors(errors) {
+    return "Diagnostic errors from TSC: " + errors;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNwaWxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90cmFuc3BpbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsK0JBQWlDO0FBQ2pDLG1DQUFtQztBQUluQyw2QkFDRSxRQUFnQixFQUNoQixPQUFlLEVBQ2YsZUFBbUM7SUFFbkMsZ0JBQU8sQ0FBQywyQ0FBMkMsQ0FBQyxDQUFDO0lBQ3JELElBQU0sZUFBZSxHQUFHLDJCQUEyQixDQUNqRCxRQUFRLEVBQ1IsT0FBTyxFQUNQLGVBQWUsQ0FDaEIsQ0FBQztJQUNGLE9BQU87UUFDTCxJQUFJLEVBQUUsZUFBZSxDQUFDLFVBQVU7UUFDaEMsR0FBRyxFQUFFLGVBQWUsQ0FBQyxhQUFhO0tBQ25DLENBQUM7QUFDSixDQUFDO0FBZkQsa0RBZUM7QUFLRCxxQ0FDRSxRQUFnQixFQUNoQixVQUFrQixFQUNsQixlQUFtQztJQUVuQyxJQUFNLGVBQWUsR0FBRyxFQUFFLENBQUMsZUFBZSxDQUFDLFVBQVUsRUFBRTtRQUNyRCxlQUFlLGlCQUFBO1FBQ2YsUUFBUSxFQUFFLFFBQVE7UUFDbEIsaUJBQWlCLEVBQUUsSUFBSTtLQUN4QixDQUFDLENBQUM7SUFDSSxJQUFBLHlDQUFXLENBQW9CO0lBRXRDLElBQUksV0FBVyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7UUFDMUIsSUFBTSxNQUFNLEdBQUcsaUJBQWlCLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDOUMsZ0JBQU8sQ0FBQyxnQ0FBZ0MsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBRWxELE1BQU0sd0JBQXdCLENBQUMsTUFBTSxDQUFDLENBQUM7S0FDeEM7SUFFRCxPQUFPLGVBQWUsQ0FBQztBQUN6QixDQUFDO0FBRUQsMkJBQTJCLFdBQTRCO0lBRXJELE9BQVUsV0FBVyxDQUFDLEdBQUcsQ0FBQyxVQUFBLENBQUMsSUFBSSxPQUFBLENBQUMsQ0FBQyxXQUFXLEVBQWIsQ0FBYSxDQUFDLE9BQUksQ0FBQztBQUNwRCxDQUFDO0FBRUQsa0NBQWtDLE1BQWM7SUFDNUMsT0FBTyxLQUFLLENBQ1YsOEVBQTRFLE1BQVEsQ0FDckYsQ0FBQztBQUNOLENBQUM7QUFFRCwwQ0FBMEMsTUFBYztJQUN0RCxPQUFPLGlDQUErQixNQUFRLENBQUM7QUFDakQsQ0FBQyJ9

package/dist/utils.d.ts

@@ -1,12 +1,8 @@
 import * as tsc from 'typescript';
-import { JestConfig, TsJestConfig } from './jest-types';
-export declare function getTSJestConfig(globals: any): TsJestConfig;
-export declare function mockGlobalTSConfigSchema(globals: any): {
-    'ts-jest': {
-        tsConfigFile: string;
-    };
-};
-export declare function getTSConfig(globals: any, rootDir?: string, collectCoverage?: boolean): any;
+import { ConfigGlobals, JestConfig, TsJestConfig } from './jest-types';
+import * as _ from 'lodash';
+export declare function getTSJestConfig(globals: ConfigGlobals): TsJestConfig;
+export declare function mockGlobalTSConfigSchema(globals: ConfigGlobals): ConfigGlobals;
+export declare const getTSConfig: ((globals: any, rootDir?: string) => tsc.CompilerOptions) & _.MemoizedFunction;
 export declare function cacheFile(jestConfig: JestConfig, filePath: string, src: string): void;
-export declare function injectSourcemapHook(filePath: string, typeScriptCode: string, src: string): string;
 export declare function runTsDiagnostics(filePath: string, compilerOptions: tsc.CompilerOptions): void;

package/dist/utils.js

@@ -14,32 +14,31 @@ var fsExtra = require("fs-extra");
 var path = require("path");
 var tsc = require("typescript");
 var logger_1 = require("./logger");
+var _ = require("lodash");
 function getTSJestConfig(globals) {
     return globals && globals['ts-jest'] ? globals['ts-jest'] : {};
 }
 exports.getTSJestConfig = getTSJestConfig;
-function formatTscParserErrors(errors) {
-    return errors.map(function (s) { return JSON.stringify(s, null, 4); }).join('\n');
+function formatTsDiagnostics(errors) {
+    var defaultFormatHost = {
+        getCurrentDirectory: function () { return tsc.sys.getCurrentDirectory(); },
+        getCanonicalFileName: function (fileName) { return fileName; },
+        getNewLine: function () { return tsc.sys.newLine; },
+    };
+    return tsc.formatDiagnostics(errors, defaultFormatHost);
 }
 function readCompilerOptions(configPath, rootDir) {
     configPath = path.resolve(rootDir, configPath);
-    var loaded = tsc.readConfigFile(configPath, function (file) {
-        var read = tsc.sys.readFile(file);
-        if (!read) {
-            throw new Error("ENOENT: no such file or directory, open '" + configPath + "'");
-        }
-        return read;
-    });
-    if (loaded.error) {
-        throw new Error(JSON.stringify(loaded.error, null, 4));
+    var _a = tsc.readConfigFile(configPath, tsc.sys.readFile), config = _a.config, error = _a.error;
+    if (error) {
+        throw error;
     }
-    var basePath = path.dirname(configPath);
-    var parsedConfig = tsc.parseJsonConfigFileContent(loaded.config, tsc.sys, basePath);
-    if (parsedConfig.errors.length > 0) {
-        var formattedErrors = formatTscParserErrors(parsedConfig.errors);
+    var _b = tsc.parseJsonConfigFileContent(config, tsc.sys, path.resolve(rootDir)), errors = _b.errors, options = _b.options;
+    if (errors.length > 0) {
+        var formattedErrors = formatTsDiagnostics(errors);
         throw new Error("Some errors occurred while attempting to read from " + configPath + ": " + formattedErrors);
     }
-    return parsedConfig.options;
+    return options;
 }
 function getStartDir() {
     var grandparent = path.resolve(__dirname, '..', '..');
@@ -60,8 +59,8 @@ function getPathToClosestTSConfig(startDir, previousDir) {
     }
     return getPathToClosestTSConfig(path.join(startDir, '..'), startDir);
 }
-function getTSConfigPathFromConfig(globals) {
-    var defaultTSConfigFile = getPathToClosestTSConfig();
+function getTSConfigPathFromConfig(globals, rootDir) {
+    var defaultTSConfigFile = getPathToClosestTSConfig(rootDir);
     if (!globals) {
         return defaultTSConfigFile;
     }
@@ -76,21 +75,14 @@ function mockGlobalTSConfigSchema(globals) {
     return { 'ts-jest': { tsConfigFile: configPath } };
 }
 exports.mockGlobalTSConfigSchema = mockGlobalTSConfigSchema;
-var tsConfigCache = {};
-function getTSConfig(globals, rootDir, collectCoverage) {
+exports.getTSConfig = _.memoize(getTSConfig_local, function (globals, rootDir) {
+    return JSON.stringify(globals, rootDir);
+});
+function getTSConfig_local(globals, rootDir) {
     if (rootDir === void 0) { rootDir = ''; }
-    if (collectCoverage === void 0) { collectCoverage = false; }
-    var configPath = getTSConfigPathFromConfig(globals);
+    var configPath = getTSConfigPathFromConfig(globals, rootDir);
     logger_1.logOnce("Reading tsconfig file from path " + configPath);
     var skipBabel = getTSJestConfig(globals).skipBabel;
-    var tsConfigCacheKey = JSON.stringify([
-        skipBabel,
-        collectCoverage,
-        configPath,
-    ]);
-    if (tsConfigCacheKey in tsConfigCache) {
-        return tsConfigCache[tsConfigCacheKey];
-    }
     var config = readCompilerOptions(configPath, rootDir);
     logger_1.logOnce('Original typescript config before modifications: ', __assign({}, config));
     delete config.sourceMap;
@@ -102,13 +94,8 @@ function getTSConfig(globals, rootDir, collectCoverage) {
     }
     config.module = config.module || tsc.ModuleKind.CommonJS;
     config.jsx = config.jsx || tsc.JsxEmit.React;
-    if (config.allowSyntheticDefaultImports && !skipBabel) {
-        config.module = tsc.ModuleKind.ES2015;
-    }
-    tsConfigCache[tsConfigCacheKey] = config;
     return config;
 }
-exports.getTSConfig = getTSConfig;
 function cacheFile(jestConfig, filePath, src) {
     if (!jestConfig.testRegex || !filePath.match(jestConfig.testRegex)) {
         var outputFilePath = path.join(jestConfig.cacheDirectory, '/ts-jest/', crypto
@@ -119,30 +106,12 @@ function cacheFile(jestConfig, filePath, src) {
     }
 }
 exports.cacheFile = cacheFile;
-function injectSourcemapHook(filePath, typeScriptCode, src) {
-    var start = src.length > 12 ? src.substr(1, 10) : '';
-    var filePathParam = JSON.stringify(filePath);
-    var codeParam = JSON.stringify(typeScriptCode);
-    var sourceMapHook = "require('ts-jest').install(" + filePathParam + ", " + codeParam + ")";
-    return start === 'use strict'
-        ? "'use strict';" + sourceMapHook + ";" + src
-        : sourceMapHook + ";" + src;
-}
-exports.injectSourcemapHook = injectSourcemapHook;
 function runTsDiagnostics(filePath, compilerOptions) {
     var program = tsc.createProgram([filePath], compilerOptions);
     var allDiagnostics = tsc.getPreEmitDiagnostics(program);
-    var formattedDiagnostics = allDiagnostics.map(function (diagnostic) {
-        if (diagnostic.file) {
-            var _a = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start), line = _a.line, character = _a.character;
-            var message = tsc.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
-            return path.relative(process.cwd(), diagnostic.file.fileName) + " (" + (line + 1) + "," + (character + 1) + "): " + message + "\n";
-        }
-        return "" + tsc.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
-    });
-    if (formattedDiagnostics.length) {
-        throw new Error(formattedDiagnostics.join(''));
+    if (allDiagnostics.length) {
+        throw new Error(formatTsDiagnostics(allDiagnostics));
     }
 }
 exports.runTsDiagnostics = runTsDiagnostics;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtCQUFpQztBQUNqQyx1QkFBeUI7QUFDekIsa0NBQW9DO0FBQ3BDLDJCQUE2QjtBQUM3QixnQ0FBa0M7QUFFbEMsbUNBQW1DO0FBRW5DLHlCQUFnQyxPQUFZO0lBQzFDLE1BQU0sQ0FBQyxPQUFPLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztBQUNqRSxDQUFDO0FBRkQsMENBRUM7QUFFRCwrQkFBK0IsTUFBd0I7SUFDckQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsVUFBQSxDQUFDLElBQUksT0FBQSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQTFCLENBQTBCLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDaEUsQ0FBQztBQUVELDZCQUE2QixVQUFrQixFQUFFLE9BQWU7SUFDOUQsVUFBVSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBRy9DLElBQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLFVBQUEsSUFBSTtRQUNoRCxJQUFNLElBQUksR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUlwQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7WUFDVixNQUFNLElBQUksS0FBSyxDQUNiLDhDQUE0QyxVQUFVLE1BQUcsQ0FDMUQsQ0FBQztRQUNKLENBQUM7UUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDO0lBQ2QsQ0FBQyxDQUFDLENBQUM7SUFFSCxFQUFFLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtCQUFpQztBQUNqQyx1QkFBeUI7QUFDekIsa0NBQW9DO0FBQ3BDLDJCQUE2QjtBQUM3QixnQ0FBa0M7QUFFbEMsbUNBQW1DO0FBQ25DLDBCQUE0QjtBQUU1Qix5QkFBZ0MsT0FBc0I7SUFDcEQsT0FBTyxPQUFPLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztBQUNqRSxDQUFDO0FBRkQsMENBRUM7QUFFRCw2QkFBNkIsTUFBd0I7SUFDbkQsSUFBTSxpQkFBaUIsR0FBOEI7UUFDbkQsbUJBQW1CLEVBQUUsY0FBTSxPQUFBLEdBQUcsQ0FBQyxHQUFHLENBQUMsbUJBQW1CLEVBQUUsRUFBN0IsQ0FBNkI7UUFDeEQsb0JBQW9CLEVBQUUsVUFBQSxRQUFRLElBQUksT0FBQSxRQUFRLEVBQVIsQ0FBUTtRQUMxQyxVQUFVLEVBQUUsY0FBTSxPQUFBLEdBQUcsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFmLENBQWU7S0FDbEMsQ0FBQztJQUVGLE9BQU8sR0FBRyxDQUFDLGlCQUFpQixDQUFDLE1BQU0sRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO0FBQzFELENBQUM7QUFFRCw2QkFDRSxVQUFrQixFQUNsQixPQUFlO0lBRWYsVUFBVSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ3pDLElBQUEscURBQW9FLEVBQWxFLGtCQUFNLEVBQUUsZ0JBQUssQ0FBc0Q7SUFDM0UsSUFBSSxLQUFLLEVBQUU7UUFDVCxNQUFNLEtBQUssQ0FBQztLQUNiO0lBRUssSUFBQSwyRUFJTCxFQUpPLGtCQUFNLEVBQUUsb0JBQU8sQ0FJckI7SUFFRixJQUFJLE1BQU0sQ0FBQyxNQUFN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