ts-jest 24.0.1 → 24.3.0

package/.ts-jest-digest

@@ -1 +1 @@
-a8aa81109806244e6aec89a7757a9d4d76a38fef
+e2c1d8a30f4a1fa691815687145c378201aba86a

package/CHANGELOG.md

@@ -1,3 +1,43 @@
+<a name="24.3.0"></a>
+# [24.3.0](https://github.com/kulshekhar/ts-jest/compare/v24.2.0...v24.3.0) (2020-01-07)
+
+
+### Bug Fixes
+
+* **config:** support babel config file path as string ([#1332](https://github.com/kulshekhar/ts-jest/issues/1332)) ([78a53c2](https://github.com/kulshekhar/ts-jest/commit/78a53c2))
+
+
+
+<a name="24.2.0"></a>
+# [24.2.0](https://github.com/kulshekhar/ts-jest/compare/v24.1.0...v24.2.0) (2019-11-22)
+
+
+### Bug Fixes
+
+* typescript serviceHost cache miss on Windows operating systems ([26ee731](https://github.com/kulshekhar/ts-jest/commit/26ee731))
+* **compiler:** pass filename to sha function instead of file extension ([ac1ac97](https://github.com/kulshekhar/ts-jest/commit/ac1ac97))
+* **transformers:** hoist jest.enableAutomock and jest.disableAutomock ([ac50bc3](https://github.com/kulshekhar/ts-jest/commit/ac50bc3))
+
+
+
+<a name="24.1.0"></a>
+# [24.1.0](https://github.com/kulshekhar/ts-jest/compare/v24.0.2...v24.1.0) (2019-09-12)
+
+
+### Bug Fixes
+
+* [#825](https://github.com/kulshekhar/ts-jest/issues/825) handle symlinked modules (ala pnpm) correctly ([e190b23](https://github.com/kulshekhar/ts-jest/commit/e190b23))
+* handle tsBuildInfoFile option ([f9583e9](https://github.com/kulshekhar/ts-jest/commit/f9583e9)), closes [#1095](https://github.com/kulshekhar/ts-jest/issues/1095)
+* **perf:** add cache for fs calls ([#908](https://github.com/kulshekhar/ts-jest/issues/908)) ([3dada81](https://github.com/kulshekhar/ts-jest/commit/3dada81))
+* **types:** unforce esModuleInterop in tsconfig.json ([c2d39b6](https://github.com/kulshekhar/ts-jest/commit/c2d39b6))
+
+
+
+<a name="24.0.2"></a>
+## [24.0.2](https://github.com/kulshekhar/ts-jest/compare/v24.0.1...v24.0.2) (2019-04-05)
+
+
+
 <a name="24.0.1"></a>
 ## [24.0.1](https://github.com/kulshekhar/ts-jest/compare/v24.0.0...v24.0.1) (2019-03-30)
 
@@ -200,26 +240,29 @@
 
 ### Bug Fixes
 
-* typos + node 6 compat ([0ed1587](https://github.com/kulshekhar/ts-jest/commit/0ed1587))
-* **ci:** can't use runInBand for e2e: cache collision ([db650f4](https://github.com/kulshekhar/ts-jest/commit/db650f4))
-* jest 22 did not have default config ([cbaddc3](https://github.com/kulshekhar/ts-jest/commit/cbaddc3))
-* **ci:** do not run e2e sub-tests in band ([18ad865](https://github.com/kulshekhar/ts-jest/commit/18ad865))
-* **ci:** ensure npm is present with ci ([edb6eda](https://github.com/kulshekhar/ts-jest/commit/edb6eda))
-* **logger:** removes cyclic imports ([5ef980f](https://github.com/kulshekhar/ts-jest/commit/5ef980f))
 * babel-config + adds test ([12146c3](https://github.com/kulshekhar/ts-jest/commit/12146c3))
-* **tests:** CI fixes ([34a41ea](https://github.com/kulshekhar/ts-jest/commit/34a41ea))
 * fixes js style to be node < 10 compatible ([83d7517](https://github.com/kulshekhar/ts-jest/commit/83d7517))
 * hoisting per level + memoize fix ([31847b0](https://github.com/kulshekhar/ts-jest/commit/31847b0))
+* jest 22 did not have default config ([cbaddc3](https://github.com/kulshekhar/ts-jest/commit/cbaddc3))
+* makes node 6 happy ([f6f82b8](https://github.com/kulshekhar/ts-jest/commit/f6f82b8))
 * makes node6 happy ([f170285](https://github.com/kulshekhar/ts-jest/commit/f170285))
+* makes window happy ([36fbebe](https://github.com/kulshekhar/ts-jest/commit/36fbebe))
+* **ci:** can't use runInBand for e2e: cache collision ([db650f4](https://github.com/kulshekhar/ts-jest/commit/db650f4))
+* **ci:** do not run e2e sub-tests in band ([18ad865](https://github.com/kulshekhar/ts-jest/commit/18ad865))
+* **ci:** ensure npm is present with ci ([edb6eda](https://github.com/kulshekhar/ts-jest/commit/edb6eda))
+* **logger:** removes cyclic imports ([5ef980f](https://github.com/kulshekhar/ts-jest/commit/5ef980f))
+* **tests:** detect npm version to use or not ci ([683a1e5](https://github.com/kulshekhar/ts-jest/commit/683a1e5))
 * node 6 unhappy again... ([703ad0b](https://github.com/kulshekhar/ts-jest/commit/703ad0b))
+* **tests:** CI fixes ([34a41ea](https://github.com/kulshekhar/ts-jest/commit/34a41ea))
+* **tests:** do not use babel in our tests + new API for simple ([3e4de3e](https://github.com/kulshekhar/ts-jest/commit/3e4de3e))
 * normalizes bundle hash on any node version ([ce7afaf](https://github.com/kulshekhar/ts-jest/commit/ce7afaf))
+* npm coming with node 6 doesn't talk `ci` ([b87198d](https://github.com/kulshekhar/ts-jest/commit/b87198d))
 * source maps ([89a30c9](https://github.com/kulshekhar/ts-jest/commit/89a30c9))
+* typos + node 6 compat ([0ed1587](https://github.com/kulshekhar/ts-jest/commit/0ed1587))
+* **tests:** more sanitizing for windows compat ([faae274](https://github.com/kulshekhar/ts-jest/commit/faae274))
 * updates templates ([f2e1da2](https://github.com/kulshekhar/ts-jest/commit/f2e1da2))
 * uses cross-platform spawn + fix pkg versions ([ac1599c](https://github.com/kulshekhar/ts-jest/commit/ac1599c))
 * we are not writing files, use normalized EOL ([47fff43](https://github.com/kulshekhar/ts-jest/commit/47fff43))
-* **tests:** detect npm version to use or not ci ([683a1e5](https://github.com/kulshekhar/ts-jest/commit/683a1e5))
-* **tests:** do not use babel in our tests + new API for simple ([3e4de3e](https://github.com/kulshekhar/ts-jest/commit/3e4de3e))
-* **tests:** more sanitizing for windows compat ([faae274](https://github.com/kulshekhar/ts-jest/commit/faae274))
 
 
 ### Features
@@ -246,6 +289,7 @@
 * **babel:** uses babel-jest cache key as part of ours ([f51c4a7](https://github.com/kulshekhar/ts-jest/commit/f51c4a7))
 * do not type check if fileName doesn't match ([cc45adc](https://github.com/kulshekhar/ts-jest/commit/cc45adc))
 * faster tests ([37a0187](https://github.com/kulshekhar/ts-jest/commit/37a0187))
+* improves speed of local test after 1st run ([cc04021](https://github.com/kulshekhar/ts-jest/commit/cc04021))
 * more cleaning ([c48f7b8](https://github.com/kulshekhar/ts-jest/commit/c48f7b8))
 * trying to improve travis-ci conf ([e4b4d95](https://github.com/kulshekhar/ts-jest/commit/e4b4d95))
 * **cache:** share config-sets for parallel test running ([090ca7b](https://github.com/kulshekhar/ts-jest/commit/090ca7b))
@@ -262,27 +306,23 @@
 * **html:** correctly transforms html source when needed ([9a2d74f](https://github.com/kulshekhar/ts-jest/commit/9a2d74f))
 * **lint:** fixes tslint script & lint issues ([60ab36e](https://github.com/kulshekhar/ts-jest/commit/60ab36e))
 * **package:** update fs-extra to version 6.0.1 ([7e73536](https://github.com/kulshekhar/ts-jest/commit/7e73536))
-* **package:** update pkg-dir to version 3.0.0 ([3fb8f9f](https://github.com/kulshekhar/ts-jest/commit/3fb8f9f))
-* **package:** update yargs to version 12.0.1 ([390ffcd](https://github.com/kulshekhar/ts-jest/commit/390ffcd))
-* **source-maps:** fix source maps options/calls ([76e27c1](https://github.com/kulshekhar/ts-jest/commit/76e27c1))
 * allow (but deprecate) use of old preprocessor.js ([a65079f](https://github.com/kulshekhar/ts-jest/commit/a65079f))
 * big refactor + fixes (mainly cache key + coverage) ([e46caae](https://github.com/kulshekhar/ts-jest/commit/e46caae))
 * fixes coverage and tests ([09500c2](https://github.com/kulshekhar/ts-jest/commit/09500c2))
 * gracefully load [@babel](https://github.com/babel)/core or babel-core ([98b2410](https://github.com/kulshekhar/ts-jest/commit/98b2410))
 * hack for babel < 6 so that breakpoints do work ([90c74ef](https://github.com/kulshekhar/ts-jest/commit/90c74ef)), closes [#627](https://github.com/kulshekhar/ts-jest/issues/627)
-* makes node 6 happy ([f6f82b8](https://github.com/kulshekhar/ts-jest/commit/f6f82b8))
-* makes window happy ([36fbebe](https://github.com/kulshekhar/ts-jest/commit/36fbebe))
-* npm coming with node 6 doesn't talk `ci` ([b87198d](https://github.com/kulshekhar/ts-jest/commit/b87198d))
+* **package:** update pkg-dir to version 3.0.0 ([3fb8f9f](https://github.com/kulshekhar/ts-jest/commit/3fb8f9f))
+* **package:** update yargs to version 12.0.1 ([390ffcd](https://github.com/kulshekhar/ts-jest/commit/390ffcd))
 * resolves correctly config file path (fix [#636](https://github.com/kulshekhar/ts-jest/issues/636)) ([5ab100c](https://github.com/kulshekhar/ts-jest/commit/5ab100c))
 * test rootDir to handle preset-angular ([8a6a8f7](https://github.com/kulshekhar/ts-jest/commit/8a6a8f7))
 * Typo in utils.ts ([#534](https://github.com/kulshekhar/ts-jest/issues/534)) ([a650260](https://github.com/kulshekhar/ts-jest/commit/a650260))
+* **source-maps:** fix source maps options/calls ([76e27c1](https://github.com/kulshekhar/ts-jest/commit/76e27c1))
 * wrong error message ([c955083](https://github.com/kulshekhar/ts-jest/commit/c955083))
 
 
 ### Performance Improvements
 
 * do not hash cache key, jest does it underneath ([fbe4f1f](https://github.com/kulshekhar/ts-jest/commit/fbe4f1f))
-* improves speed of local test after 1st run ([cc04021](https://github.com/kulshekhar/ts-jest/commit/cc04021))
 
 
 

package/README.md

@@ -46,7 +46,7 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduc
 
 ## Versioning
 
-We **DO NOT** use [SemVer](http://semver.org/) for versioning. Tho you can think about SemVer when reading our version, except our major number follows the one of Jest. For the versions available, see the [tags on this repository](https://github.com/kulshekhar/ts-jest/tags).
+We **DO NOT** use [SemVer](http://semver.org/) for versioning. Though you can think about SemVer when reading our version, except our major number follows the one of Jest. For the versions available, see the [tags on this repository](https://github.com/kulshekhar/ts-jest/tags).
 
 ## Authors/maintainers
 
@@ -57,6 +57,10 @@ We **DO NOT** use [SemVer](http://semver.org/) for versioning. Tho you can think
 
 See also the list of [contributors](https://github.com/kulshekhar/ts-jest/contributors) who participated in this project.
 
+## Supporters
+
+- [JetBrains](https://www.jetbrains.com/?from=ts-jest) has been kind enough to support ts-jest with an [open source license](https://www.jetbrains.com/community/opensource/?from=ts-jest).
+
 ## License
 
 This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details

package/dist/cli/config/init.js

@@ -11,10 +11,11 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -45,13 +46,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
 var fs_1 = require("fs");
 var json5_1 = require("json5");
 var path_1 = require("path");
 var presets_1 = require("../helpers/presets");
-exports.run = function (args) { return __awaiter(_this, void 0, void 0, function () {
+exports.run = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var file, filePath, name, isPackage, exists, pkgFile, hasPackage, _a, jestPreset, askedTsconfig, force, jsdom, tsconfig, pkgJson, jsFilesProcessor, shouldPostProcessWithBabel, preset, body, base, tsJestConf, content;
     return __generator(this, function (_b) {
         file = args._[0] || 'jest.config.js';
@@ -110,7 +110,7 @@ exports.run = function (args) { return __awaiter(_this, void 0, void 0, function
                 if (shouldPostProcessWithBabel)
                     tsJestConf.babelConfig = true;
             }
-            body = JSON.stringify(__assign({}, pkgJson, { jest: base }), undefined, '  ');
+            body = JSON.stringify(__assign(__assign({}, pkgJson), { jest: base }), undefined, '  ');
         }
         else {
             content = [];
@@ -144,7 +144,7 @@ exports.run = function (args) { return __awaiter(_this, void 0, void 0, function
         return [2];
     });
 }); };
-exports.help = function () { return __awaiter(_this, void 0, void 0, function () {
+exports.help = function () { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         process.stdout.write("\nUsage:\n  ts-jest config:init [options] [<config-file>]\n\nArguments:\n  <config-file>         Can be a js or json Jest config file. If it is a\n                        package.json file, the configuration will be read from\n                        the \"jest\" property.\n                        Default: jest.config.js\n\nOptions:\n  --force               Discard any existing Jest config\n  --js ts|babel         Process .js files with ts-jest if 'ts' or with\n                        babel-jest if 'babel'\n  --no-jest-preset      Disable the use of Jest presets\n  --tsconfig <file>     Path to the tsconfig.json file\n  --babel               Pipe babel-jest after ts-jest\n  --jsdom               Use jsdom as test environment instead of node\n");
         return [2];

package/dist/cli/config/migrate.js

@@ -1,9 +1,10 @@
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -54,19 +55,15 @@ var __spread = (this && this.__spread) || function () {
     for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
     return ar;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
 var bs_logger_1 = require("bs-logger");
-var fast_json_stable_stringify_1 = __importDefault(require("fast-json-stable-stringify"));
+var stringifyJson = require("fast-json-stable-stringify");
 var fs_1 = require("fs");
 var json5_1 = require("json5");
 var path_1 = require("path");
 var backports_1 = require("../../util/backports");
 var presets_1 = require("../helpers/presets");
-exports.run = function (args) { return __awaiter(_this, void 0, void 0, function () {
+exports.run = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var nullLogger, file, filePath, footNotes, name, isPackage, actualConfig, migratedConfig, presetName, preset, jsTransformers, jsWithTs, jsWithBabel, presetValue, migratedValue, presetValue, migratedValue, before, after, stringify, prefix;
     return __generator(this, function (_a) {
         nullLogger = bs_logger_1.createLogger({ targets: [] });
@@ -158,13 +155,13 @@ exports.run = function (args) { return __awaiter(_this, void 0, void 0, function
         }
         if (preset &&
             migratedConfig.transform &&
-            fast_json_stable_stringify_1.default(migratedConfig.transform) === fast_json_stable_stringify_1.default(preset.value.transform)) {
+            stringifyJson(migratedConfig.transform) === stringifyJson(preset.value.transform)) {
             delete migratedConfig.transform;
         }
         cleanupConfig(actualConfig);
         cleanupConfig(migratedConfig);
-        before = fast_json_stable_stringify_1.default(actualConfig);
-        after = fast_json_stable_stringify_1.default(migratedConfig);
+        before = stringifyJson(actualConfig);
+        after = stringifyJson(migratedConfig);
         if (after === before) {
             process.stderr.write("\nNo migration needed for given Jest configuration\n    ");
             return [2];
@@ -212,7 +209,7 @@ function dedupSort(arr) {
         .filter(function (s, i, a) { return a.findIndex(function (e) { return s.toString() === e.toString(); }) === i; })
         .sort(function (a, b) { return (a.toString() > b.toString() ? 1 : a.toString() < b.toString() ? -1 : 0); });
 }
-exports.help = function () { return __awaiter(_this, void 0, void 0, function () {
+exports.help = function () { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         process.stdout.write("\nUsage:\n  ts-jest config:migrate [options] <config-file>\n\nArguments:\n  <config-file>         Can be a js or json Jest config file. If it is a\n                        package.json file, the configuration will be read from\n                        the \"jest\" property.\n\nOptions:\n  --js ts|babel         Process .js files with ts-jest if 'ts' or with\n                        babel-jest if 'babel'\n  --no-jest-preset      Disable the use of Jest presets\n");
         return [2];

package/dist/cli/help.js

@@ -1,9 +1,10 @@
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -34,9 +35,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = function (_) { return __awaiter(_this, void 0, void 0, function () {
+exports.run = function (_) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         process.stdout.write("\nUsage:\n  ts-jest command [options] [...args]\n\nCommands:\n  config:init           Creates initial Jest configuration\n  config:migrate        Migrates a given Jest configuration\n  help [command]        Show this help, or help about a command\n\nExample:\n  ts-jest help config:migrate\n");
         return [2];

package/dist/cli/index.js

@@ -1,9 +1,10 @@
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -34,13 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
 var bs_logger_1 = require("bs-logger");
-var yargs_parser_1 = __importDefault(require("yargs-parser"));
+var yargsParser = require("yargs-parser");
 var logger_1 = require("../util/logger");
 var VALID_COMMANDS = ['help', 'config:migrate', 'config:init'];
 var logger = logger_1.rootLogger.child((_a = {}, _a[bs_logger_1.LogContexts.namespace] = 'cli', _a[bs_logger_1.LogContexts.application] = 'ts-jest', _a));
@@ -48,7 +46,7 @@ function cli(args) {
     return __awaiter(this, void 0, void 0, function () {
         var parsedArgv, command, isHelp, _a, run, help, cmd;
         return __generator(this, function (_b) {
-            parsedArgv = yargs_parser_1.default(args, {
+            parsedArgv = yargsParser(args, {
                 boolean: ['dry-run', 'jest-preset', 'allow-js', 'diff', 'babel', 'force', 'jsdom'],
                 string: ['tsconfig', 'js'],
                 count: ['verbose'],

package/dist/compiler.js

@@ -10,15 +10,16 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
@@ -36,14 +37,12 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var bs_logger_1 = require("bs-logger");
-var buffer_from_1 = __importDefault(require("buffer-from"));
+var bufferFrom = require("buffer-from");
 var stableStringify = require("fast-json-stable-stringify");
 var fs_1 = require("fs");
+var memoize = require("lodash.memoize");
 var mkdirp = require("mkdirp");
 var path_1 = require("path");
 var messages_1 = require("./util/messages");
@@ -112,30 +111,33 @@ function createCompiler(configs) {
             _b.namespace = 'ts:serviceHost',
             _b.call = null,
             _b);
-        var serviceHostTraceCtx = __assign({}, serviceHostDebugCtx, (_c = {}, _c[bs_logger_1.LogContexts.logLevel] = bs_logger_1.LogLevels.trace, _c));
+        var serviceHostTraceCtx = __assign(__assign({}, serviceHostDebugCtx), (_c = {}, _c[bs_logger_1.LogContexts.logLevel] = bs_logger_1.LogLevels.trace, _c));
         var serviceHost = {
             getScriptFileNames: function () { return Object.keys(memoryCache.versions); },
             getScriptVersion: function (fileName) {
-                var version = memoryCache.versions[fileName];
+                var normalizedFileName = path_1.normalize(fileName);
+                var version = memoryCache.versions[normalizedFileName];
                 return version === undefined ? undefined : String(version);
             },
             getScriptSnapshot: function (fileName) {
-                var hit = hasOwn.call(memoryCache.contents, fileName);
-                logger.trace({ fileName: fileName, cacheHit: hit }, "getScriptSnapshot():", 'cache', hit ? 'hit' : 'miss');
+                var normalizedFileName = path_1.normalize(fileName);
+                var hit = hasOwn.call(memoryCache.contents, normalizedFileName);
+                logger.trace({ normalizedFileName: normalizedFileName, cacheHit: hit }, "getScriptSnapshot():", 'cache', hit ? 'hit' : 'miss');
                 if (!hit) {
-                    memoryCache.contents[fileName] = ts.sys.readFile(fileName);
+                    memoryCache.contents[normalizedFileName] = ts.sys.readFile(normalizedFileName);
                 }
-                var contents = memoryCache.contents[fileName];
+                var contents = memoryCache.contents[normalizedFileName];
                 if (contents === undefined) {
                     return;
                 }
                 return ts.ScriptSnapshot.fromString(contents);
             },
-            fileExists: ts.sys.fileExists,
-            readFile: logger.wrap(serviceHostTraceCtx, 'readFile', ts.sys.readFile),
-            readDirectory: ts.sys.readDirectory,
-            getDirectories: ts.sys.getDirectories,
-            directoryExists: ts.sys.directoryExists,
+            fileExists: memoize(ts.sys.fileExists),
+            readFile: logger.wrap(serviceHostTraceCtx, 'readFile', memoize(ts.sys.readFile)),
+            readDirectory: memoize(ts.sys.readDirectory),
+            getDirectories: memoize(ts.sys.getDirectories),
+            directoryExists: memoize(ts.sys.directoryExists),
+            realpath: memoize(ts.sys.realpath),
             getNewLine: function () { return '\n'; },
             getCurrentDirectory: function () { return cwd; },
             getCompilationSettings: function () { return compilerOptions; },
@@ -213,7 +215,7 @@ function readThrough(cachedir, memoryCache, compile, getExtension, cwd, logger)
 }
 function updateOutput(outputText, fileName, sourceMap, getExtension, sourceRoot) {
     var base = path_1.basename(fileName);
-    var base64Map = buffer_from_1.default(updateSourceMap(sourceMap, fileName, sourceRoot), 'utf8').toString('base64');
+    var base64Map = bufferFrom(updateSourceMap(sourceMap, fileName, sourceRoot), 'utf8').toString('base64');
     var sourceMapContent = "data:application/json;charset=utf-8;base64," + base64Map;
     var sourceMapLength = (base + ".map").length + (getExtension(fileName).length - path_1.extname(fileName).length);
     return outputText.slice(0, -sourceMapLength) + sourceMapContent;
@@ -226,7 +228,7 @@ function updateSourceMap(sourceMapText, fileName, _sourceRoot) {
     return stableStringify(sourceMap);
 }
 function getCacheName(sourceCode, fileName) {
-    return sha1_1.sha1(path_1.extname(fileName), '\x00', sourceCode);
+    return sha1_1.sha1(fileName, '\x00', sourceCode);
 }
 function isValidCacheContent(contents) {
     return /(?:9|0=|Q==)$/.test(contents.slice(-3));

package/dist/config/config-set.d.ts

@@ -4,29 +4,29 @@ import { CompilerOptions, CustomTransformers, ParsedCommandLine } from 'typescri
 import { AstTransformerDesc, BabelConfig, BabelJestTransformer, TTypeScript, TsCompiler, TsJestConfig, TsJestGlobalOptions, TsJestHooksMap } from '../types';
 export declare class ConfigSet {
     readonly parentOptions?: TsJestGlobalOptions | undefined;
-    readonly projectPackageJson: Record<string, any>;
-    readonly projectDependencies: Record<string, string>;
-    readonly jest: jest.ProjectConfig;
-    readonly tsJest: TsJestConfig;
-    readonly typescript: ParsedCommandLine;
-    readonly tsconfig: any;
-    readonly versions: Record<string, string>;
+    get projectPackageJson(): Record<string, any>;
+    get projectDependencies(): Record<string, string>;
+    get jest(): jest.ProjectConfig;
+    get tsJest(): TsJestConfig;
+    get typescript(): ParsedCommandLine;
+    get tsconfig(): any;
+    get versions(): Record<string, string>;
     private static loadConfig;
-    readonly babel: BabelConfig | undefined;
-    readonly compilerModule: TTypeScript;
-    readonly babelJestTransformer: BabelJestTransformer | undefined;
-    readonly tsCompiler: TsCompiler;
-    readonly astTransformers: AstTransformerDesc[];
-    readonly tsCustomTransformers: CustomTransformers;
-    readonly hooks: TsJestHooksMap;
-    readonly shouldReportDiagnostic: (filePath: string) => boolean;
-    readonly shouldStringifyContent: (filePath: string) => boolean;
-    readonly tsCacheDir: string | undefined;
-    readonly overriddenCompilerOptions: Partial<CompilerOptions>;
-    readonly rootDir: string;
-    readonly cwd: string;
-    readonly tsJestDigest: string;
-    readonly cacheKey: string;
+    get babel(): BabelConfig | undefined;
+    get compilerModule(): TTypeScript;
+    get babelJestTransformer(): BabelJestTransformer | undefined;
+    get tsCompiler(): TsCompiler;
+    get astTransformers(): AstTransformerDesc[];
+    get tsCustomTransformers(): CustomTransformers;
+    get hooks(): TsJestHooksMap;
+    get shouldReportDiagnostic(): (filePath: string) => boolean;
+    get shouldStringifyContent(): (filePath: string) => boolean;
+    get tsCacheDir(): string | undefined;
+    get overriddenCompilerOptions(): Partial<CompilerOptions>;
+    get rootDir(): string;
+    get cwd(): string;
+    get tsJestDigest(): string;
+    get cacheKey(): string;
     readonly logger: Logger;
     constructor(jestConfig: jest.ProjectConfig, parentOptions?: TsJestGlobalOptions | undefined, parentLogger?: Logger);
     resolvePath(inputPath: string, { throwIfMissing, nodeResolve }?: {

package/dist/config/config-set.js

@@ -16,15 +16,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
@@ -46,15 +47,12 @@ var __spread = (this && this.__spread) || function () {
     for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
     return ar;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var bs_logger_1 = require("bs-logger");
 var fs_1 = require("fs");
-var json5_1 = __importDefault(require("json5"));
+var json5 = require("json5");
 var path_1 = require("path");
-var semver_1 = __importDefault(require("semver"));
+var semver = require("semver");
 var __1 = require("..");
 var compiler_1 = require("../compiler");
 var transformers_1 = require("../transformers");
@@ -88,8 +86,8 @@ var toDiagnosticCode = function (code) {
     return code ? parseInt(("" + code).trim().replace(/^TS/, ''), 10) || undefined : undefined;
 };
 var toDiagnosticCodeList = function (items, into) {
-    if (into === void 0) { into = []; }
     var e_1, _a;
+    if (into === void 0) { into = []; }
     if (!Array.isArray(items))
         items = [items];
     try {
@@ -166,7 +164,7 @@ var ConfigSet = (function () {
     Object.defineProperty(ConfigSet.prototype, "projectDependencies", {
         get: function () {
             var pkg = this.projectPackageJson;
-            var names = Object.keys(__assign({}, pkg.optionalDependencies, pkg.peerDependencies, pkg.devDependencies, pkg.dependencies));
+            var names = Object.keys(__assign(__assign(__assign(__assign({}, pkg.optionalDependencies), pkg.peerDependencies), pkg.devDependencies), pkg.dependencies));
             return names.reduce(function (map, name) {
                 var version = get_package_version_1.getPackageVersion(name);
                 if (version)
@@ -182,7 +180,7 @@ var ConfigSet = (function () {
             var config = backports_1.backportJestConfig(this.logger, this._jestConfig);
             if (this.parentOptions) {
                 var globals = config.globals || (config.globals = {});
-                globals['ts-jest'] = __assign({}, this.parentOptions, globals['ts-jest']);
+                globals['ts-jest'] = __assign(__assign({}, this.parentOptions), globals['ts-jest']);
             }
             this.logger.debug({ jestConfig: config }, 'normalized jest config');
             return config;
@@ -342,7 +340,7 @@ var ConfigSet = (function () {
     });
     ConfigSet.loadConfig = function (base) {
         var _a = importer_1.importer.babelCore(messages_1.ImportReasons.BabelJest), OptionManager = _a.OptionManager, loadPartialConfig = _a.loadPartialConfig, version = _a.version;
-        if (version && semver_1.default.satisfies(version, '>=6 <7')) {
+        if (version && semver.satisfies(version, '>=6 <7')) {
             delete base.cwd;
         }
         if (typeof loadPartialConfig === 'function') {
@@ -363,11 +361,16 @@ var ConfigSet = (function () {
             var base = { cwd: this.cwd };
             if (babelConfig.kind === 'file') {
                 if (babelConfig.value) {
-                    base = __assign({}, base, json5_1.default.parse(fs_1.readFileSync(babelConfig.value, 'utf8')));
+                    if (path_1.extname(babelConfig.value) === '.js') {
+                        base = __assign(__assign({}, base), require(babelConfig.value));
+                    }
+                    else {
+                        base = __assign(__assign({}, base), json5.parse(fs_1.readFileSync(babelConfig.value, 'utf8')));
+                    }
                 }
             }
             else if (babelConfig.kind === 'inline') {
-                base = __assign({}, base, babelConfig.value);
+                base = __assign(__assign({}, base), babelConfig.value);
             }
             var config = ConfigSet.loadConfig(base);
             this.logger.debug({ babelConfig: config }, 'normalized babel config');
@@ -534,7 +537,9 @@ var ConfigSet = (function () {
                 declarationDir: undefined,
                 declarationMap: undefined,
                 emitDeclarationOnly: undefined,
+                incremental: undefined,
                 sourceRoot: undefined,
+                tsBuildInfoFile: undefined,
             };
             if (!this.tsJest.babelConfig) {
                 options.module = this.compilerModule.ModuleKind.CommonJS;
@@ -635,11 +640,11 @@ var ConfigSet = (function () {
                     };
                 }
                 config = result_1.config;
-                input = __assign({}, result_1.config, { compilerOptions: __assign({}, (result_1.config && result_1.config.compilerOptions), compilerOptions) });
+                input = __assign(__assign({}, result_1.config), { compilerOptions: __assign(__assign({}, (result_1.config && result_1.config.compilerOptions)), compilerOptions) });
                 basePath = normalize_slashes_1.normalizeSlashes(path_1.dirname(configFileName));
             }
         }
-        config.compilerOptions = __assign({}, config.compilerOptions, compilerOptions);
+        config.compilerOptions = __assign(__assign({}, config.compilerOptions), compilerOptions);
         var result = ts.parseJsonConfigFileContent(config, ts.sys, basePath, undefined, configFileName);
         var forcedOptions = this.overriddenCompilerOptions;
         var finalOptions = result.options;

package/dist/config/create-jest-preset.js

@@ -14,10 +14,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var logger_1 = require("../util/logger");
 var logger = logger_1.rootLogger.child({ namespace: 'jest-preset' });
 function createJestPreset(_a, from) {
-    var _b = (_a === void 0 ? {} : _a).allowJs, allowJs = _b === void 0 ? false : _b;
+    var _b;
+    var _c = (_a === void 0 ? {} : _a).allowJs, allowJs = _c === void 0 ? false : _c;
     if (from === void 0) { from = {}; }
-    var _c;
     logger.debug({ allowJs: allowJs }, 'creating jest presets', allowJs ? 'handling' : 'not handling', 'JavaScript files');
-    return __assign({ transform: __assign({}, from.transform, (_c = {}, _c[allowJs ? '^.+\\.[tj]sx?$' : '^.+\\.tsx?$'] = 'ts-jest', _c)) }, (from.testMatch ? { testMatch: from.testMatch } : undefined), (from.moduleFileExtensions ? { moduleFileExtensions: from.moduleFileExtensions } : undefined));
+    return __assign(__assign({ transform: __assign(__assign({}, from.transform), (_b = {}, _b[allowJs ? '^.+\\.[tj]sx?$' : '^.+\\.tsx?$'] = 'ts-jest', _b)) }, (from.testMatch ? { testMatch: from.testMatch } : undefined)), (from.moduleFileExtensions ? { moduleFileExtensions: from.moduleFileExtensions } : undefined));
 }
 exports.createJestPreset = createJestPreset;

package/dist/config/paths-to-module-name-mapper.js

@@ -1,24 +1,25 @@
 "use strict";
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
-Object.defineProperty(exports, "__esModule", { value: true });
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
 var bs_logger_1 = require("bs-logger");
 var logger_1 = require("../util/logger");
 var messages_1 = require("../util/messages");
 var escapeRegex = function (str) { return str.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&'); };
 var logger = logger_1.rootLogger.child((_a = {}, _a[bs_logger_1.LogContexts.namespace] = 'path-mapper', _a));
 exports.pathsToModuleNameMapper = function (mapping, _a) {
-    var _b = (_a === void 0 ? {} : _a).prefix, prefix = _b === void 0 ? '' : _b;
-    var e_1, _c;
+    var e_1, _b;
+    var _c = (_a === void 0 ? {} : _a).prefix, prefix = _c === void 0 ? '' : _c;
     var jestMap = {};
     try {
         for (var _d = __values(Object.keys(mapping)), _e = _d.next(); !_e.done; _e = _d.next()) {
@@ -54,7 +55,7 @@ exports.pathsToModuleNameMapper = function (mapping, _a) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
+            if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
         }
         finally { if (e_1) throw e_1.error; }
     }

package/dist/index.js

@@ -19,8 +19,8 @@ var __spread = (this && this.__spread) || function () {
     for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
     return ar;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
 var bs_logger_1 = require("bs-logger");
 var fs_1 = require("fs");
 var path_1 = require("path");
@@ -50,20 +50,20 @@ function createTransformer(baseConfig) {
 }
 exports.createTransformer = createTransformer;
 function process() {
+    var _a;
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         args[_i] = arguments[_i];
     }
-    var _a;
     return (_a = defaultTransformer()).process.apply(_a, __spread(args));
 }
 exports.process = process;
 function getCacheKey() {
+    var _a;
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         args[_i] = arguments[_i];
     }
-    var _a;
     return (_a = defaultTransformer()).getCacheKey.apply(_a, __spread(args));
 }
 exports.getCacheKey = getCacheKey;

package/dist/transformers/hoist-jest.js

@@ -21,7 +21,7 @@ var __spread = (this && this.__spread) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var bs_logger_1 = require("bs-logger");
-var HOIST_METHODS = ['mock', 'unmock'];
+var HOIST_METHODS = ['mock', 'unmock', 'enableAutomock', 'disableAutomock'];
 exports.name = 'hoisting-jest-mock';
 exports.version = 1;
 function factory(cs) {

package/dist/transformers/index.js

@@ -1,11 +1,4 @@
 "use strict";
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var hoisting = __importStar(require("./hoist-jest"));
+var hoisting = require("./hoist-jest");
 exports.internals = [hoisting];

package/dist/ts-jest-transformer.d.ts

@@ -3,7 +3,7 @@ import { Logger } from 'bs-logger';
 import { ConfigSet } from './config/config-set';
 import { TsJestGlobalOptions } from './types';
 export declare class TsJestTransformer implements jest.Transformer {
-    static readonly lastTransformerId: number;
+    static get lastTransformerId(): number;
     readonly logger: Logger;
     readonly id: number;
     readonly options: TsJestGlobalOptions;

package/dist/ts-jest-transformer.js

@@ -107,7 +107,7 @@ var TsJestTransformer = (function () {
         }
         if (babelJest) {
             this.logger.debug({ fileName: filePath }, 'calling babel-jest processor');
-            result = babelJest.process(result, filePath, jestConfig, __assign({}, transformOptions, { instrument: false }));
+            result = babelJest.process(result, filePath, jestConfig, __assign(__assign({}, transformOptions), { instrument: false }));
         }
         if (hooks.afterProcess) {
             this.logger.debug({ fileName: filePath, hookName: 'afterProcess' }, 'calling afterProcess hook');

package/dist/types.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="jest" />
 import * as _babel from 'babel__core';
-import _ts, { CompilerOptions, SourceFile, TransformerFactory } from 'typescript';
+import { CompilerOptions, SourceFile, TransformerFactory } from 'typescript';
+import * as _ts from 'typescript';
 import { ConfigSet } from './config/config-set';
 export declare type TBabelCore = typeof _babel;
 export declare type TTypeScript = typeof _ts;

package/dist/util/backports.js

@@ -10,13 +10,13 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
 var bs_logger_1 = require("bs-logger");
 var messages_1 = require("./messages");
 var context = (_a = {}, _a[bs_logger_1.LogContexts.namespace] = 'backports', _a);
 exports.backportJestConfig = function (logger, config) {
-    logger.debug(__assign({}, context, { config: config }), 'backporting config');
+    logger.debug(__assign(__assign({}, context), { config: config }), 'backporting config');
     var _a = (config || {}).globals, globals = _a === void 0 ? {} : _a;
     var _b = globals["ts-jest"], tsJest = _b === void 0 ? {} : _b;
     var mergeTsJest = {};
@@ -84,7 +84,7 @@ exports.backportJestConfig = function (logger, config) {
     if (hadWarnings) {
         logger.warn(context, messages_1.Helps.MigrateConfigUsingCLI);
     }
-    return __assign({}, config, { globals: __assign({}, globals, { 'ts-jest': __assign({}, mergeTsJest, tsJest) }) });
+    return __assign(__assign({}, config), { globals: __assign(__assign({}, globals), { 'ts-jest': __assign(__assign({}, mergeTsJest), tsJest) }) });
 };
 exports.backportTsJestDebugEnvVar = function (logger) {
     if ('TS_JEST_DEBUG' in process.env) {

package/dist/util/testing.d.ts

@@ -1,35 +1,34 @@
 /// <reference types="jest" />
-interface MockWithArgs<T> extends Function, jest.MockInstance<T> {
-    new (...args: ArgumentsOf<T>): T;
-    (...args: ArgumentsOf<T>): any;
-}
+declare type MockableFunction = (...args: any[]) => any;
 declare type MethodKeysOf<T> = {
-    [K in keyof T]: T[K] extends Function ? K : never;
+    [K in keyof T]: T[K] extends MockableFunction ? K : never;
 }[keyof T];
 declare type PropertyKeysOf<T> = {
-    [K in keyof T]: T[K] extends Function ? never : K;
+    [K in keyof T]: T[K] extends MockableFunction ? never : K;
 }[keyof T];
 declare type ArgumentsOf<T> = T extends (...args: infer A) => any ? A : never;
-interface MockWithArgs<T> extends Function, jest.MockInstance<T> {
-    new (...args: ArgumentsOf<T>): T;
-    (...args: ArgumentsOf<T>): any;
+declare type ConstructorArgumentsOf<T> = T extends new (...args: infer A) => any ? A : never;
+interface MockWithArgs<T extends MockableFunction> extends jest.MockInstance<ReturnType<T>, ArgumentsOf<T>> {
+    new (...args: ConstructorArgumentsOf<T>): T;
+    (...args: ArgumentsOf<T>): ReturnType<T>;
 }
-declare type MockedFunction<T> = MockWithArgs<T> & {
+declare type MaybeMockedConstructor<T> = T extends new (...args: any[]) => infer R ? jest.MockInstance<R, ConstructorArgumentsOf<T>> : {};
+declare type MockedFunction<T extends MockableFunction> = MockWithArgs<T> & {
     [K in keyof T]: T[K];
 };
-declare type MockedFunctionDeep<T> = MockWithArgs<T> & MockedObjectDeep<T>;
-declare type MockedObject<T> = {
-    [K in MethodKeysOf<T>]: MockedFunction<T[K]>;
+declare type MockedFunctionDeep<T extends MockableFunction> = MockWithArgs<T> & MockedObjectDeep<T>;
+declare type MockedObject<T> = MaybeMockedConstructor<T> & {
+    [K in MethodKeysOf<T>]: T[K] extends MockableFunction ? MockedFunction<T[K]> : T[K];
 } & {
     [K in PropertyKeysOf<T>]: T[K];
 };
-declare type MockedObjectDeep<T> = {
-    [K in MethodKeysOf<T>]: MockedFunctionDeep<T[K]>;
+declare type MockedObjectDeep<T> = MaybeMockedConstructor<T> & {
+    [K in MethodKeysOf<T>]: T[K] extends MockableFunction ? MockedFunctionDeep<T[K]> : T[K];
 } & {
     [K in PropertyKeysOf<T>]: MaybeMockedDeep<T[K]>;
 };
-export declare type MaybeMockedDeep<T> = T extends Function ? MockedFunctionDeep<T> : T extends object ? MockedObjectDeep<T> : T;
-export declare type MaybeMocked<T> = T extends Function ? MockedFunction<T> : T extends object ? MockedObject<T> : T;
+export declare type MaybeMockedDeep<T> = T extends MockableFunction ? MockedFunctionDeep<T> : T extends object ? MockedObjectDeep<T> : T;
+export declare type MaybeMocked<T> = T extends MockableFunction ? MockedFunction<T> : T extends object ? MockedObject<T> : T;
 export declare function mocked<T>(item: T, deep?: false): MaybeMocked<T>;
 export declare function mocked<T>(item: T, deep: true): MaybeMockedDeep<T>;
 export {};

package/dist/util/ts-error.js

@@ -5,7 +5,7 @@ var __extends = (this && this.__extends) || (function () {
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
             function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
         return extendStatics(d, b);
-    }
+    };
     return function (d, b) {
         extendStatics(d, b);
         function __() { this.constructor = d; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "24.0.1",
+  "version": "24.3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": "cli.js",
@@ -33,6 +33,7 @@
     "prepare": "npm run build",
     "prepublishOnly": "npm run test",
     "preversion": "npm run test",
+    "update:e2e": "node scripts/update-e2e-templates.js",
     "version": "npm run changelog && git add CHANGELOG.md"
   },
   "repository": {
@@ -59,6 +60,7 @@
     "bs-logger": "0.x",
     "buffer-from": "1.x",
     "fast-json-stable-stringify": "2.x",
+    "lodash.memoize": "4.x",
     "json5": "2.x",
     "make-error": "1.x",
     "mkdirp": "0.x",
@@ -77,7 +79,7 @@
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "7.x",
+    "@commitlint/cli": "8.x",
     "@commitlint/config-conventional": "7.x",
     "@types/babel__core": "7.x",
     "@types/buffer-from": "latest",
@@ -103,7 +105,6 @@
     "jest": "24.x",
     "js-yaml": "latest",
     "lint-staged": "latest",
-    "lodash.memoize": "4.x",
     "lodash.merge": "4.x",
     "lodash.set": "4.x",
     "npm-run-all": "latest",
@@ -115,16 +116,14 @@
     "typescript": "3.x"
   },
   "lint-staged": {
-    "linters": {
-      "*.{ts,tsx}": [
-        "tslint --fix",
-        "git add"
-      ],
-      "*.{js,jsx}": [
-        "eslint --fix",
-        "git add"
-      ]
-    }
+    "*.{ts,tsx}": [
+      "tslint --fix",
+      "git add"
+    ],
+    "*.{js,jsx}": [
+      "eslint --fix",
+      "git add"
+    ]
   },
   "engines": {
     "node": ">= 6"

package/.gitattributes

@@ -1,2 +0,0 @@
-package-lock.json   -diff -merge
-package-lock.json    linguist-generated=true