ts-jest 24.3.0 → 25.2.1

package/.ts-jest-digest

@@ -1 +1 @@
-e2c1d8a30f4a1fa691815687145c378201aba86a
+6982d3f1883cd9adc2334b36b70c6625ec327569

package/CHANGELOG.md

@@ -1,3 +1,57 @@
+<a name="25.2.1"></a>
+## [25.2.1](https://github.com/kulshekhar/ts-jest/compare/v25.2.0...v25.2.1) (2020-02-19)
+
+
+### Bug Fixes
+
+* **compiler:** allow transformation of typescript files in node_modules ([#1385](https://github.com/kulshekhar/ts-jest/issues/1385)) ([814405e](https://github.com/kulshekhar/ts-jest/commit/814405e))
+* **transformer:** add deepUnmock to hoist method list ([#1372](https://github.com/kulshekhar/ts-jest/issues/1372)) ([0fbbc00](https://github.com/kulshekhar/ts-jest/commit/0fbbc00))
+* **util:** use resolve package typescript package in yarn workspaces ([#1377](https://github.com/kulshekhar/ts-jest/issues/1377)) ([a63808c](https://github.com/kulshekhar/ts-jest/commit/a63808c))
+
+
+
+<a name="25.2.0"></a>
+# [25.2.0](https://github.com/kulshekhar/ts-jest/compare/v25.1.0...v25.2.0) (2020-02-03)
+
+
+### Bug Fixes
+
+* **config:** comment out unused codes ([dff1332](https://github.com/kulshekhar/ts-jest/commit/dff1332))
+* **config:** pass plain config object to babel-jest transformer ([e0895da](https://github.com/kulshekhar/ts-jest/commit/e0895da))
+* **config:** remove unused codes ([7aa3928](https://github.com/kulshekhar/ts-jest/commit/7aa3928))
+* **config:** remove unused import ([81897e1](https://github.com/kulshekhar/ts-jest/commit/81897e1))
+* **test:** improve unit tests for babel config ([ebd9380](https://github.com/kulshekhar/ts-jest/commit/ebd9380))
+* **test:** update snapshot ([0e1190d](https://github.com/kulshekhar/ts-jest/commit/0e1190d))
+
+
+
+<a name="25.1.0"></a>
+# [25.1.0](https://github.com/kulshekhar/ts-jest/compare/v25.0.0...v25.1.0) (2020-01-30)
+
+
+### Bug Fixes
+
+* jest 25 type definitions ([ba82a9e](https://github.com/kulshekhar/ts-jest/commit/ba82a9e))
+
+
+
+<a name="25.0.0"></a>
+# [25.0.0](https://github.com/kulshekhar/ts-jest/compare/v24.3.0...v25.0.0) (2020-01-23)
+
+
+### Bug Fixes
+
+* Fix tests for version checks v2 ([154f1d6](https://github.com/kulshekhar/ts-jest/commit/154f1d6))
+* Try to fix snapshots ([ea0ea50](https://github.com/kulshekhar/ts-jest/commit/ea0ea50))
+* Try to fix snapshots v2 ([82445bb](https://github.com/kulshekhar/ts-jest/commit/82445bb))
+
+
+### Features
+
+* support Jest 25 ([ffc2cfe](https://github.com/kulshekhar/ts-jest/commit/ffc2cfe))
+
+
+
 <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)
 

package/README.md

@@ -13,7 +13,7 @@ It supports all features of TypeScript including type-checking. [Read more about
 
 [<img src="./docs/assets/img/documentation.png" align="left" height="24"> View the online documentation (usage & technical)](https://kulshekhar.github.io/ts-jest)
 
-[<img src="./docs/assets/img/slack.png" align="left" height="24"> Ask for some help in the `ts-jest` community of Slack](https://bit.ly/ts-jest-slack)
+[<img src="./docs/assets/img/slack.png" align="left" height="24"> Ask for some help in the `ts-jest` community of Slack](https://join.slack.com/t/ts-jest/shared_invite/enQtNDE1ODQ0OTEzMTczLWI5NTQ4ZmEzOTYxYzM2NjhiZDM2ZTI3MGYyYjA2Y2E1YTMxMjUyYTcxNTlmNjAyZTc2Nzk4YTRmZmRhYmZmYTg)
 
 <!--
 [<img src="./docs/assets/img/troubleshooting.png" align="left" height="24"> Before reporting any issue, be sure to check the troubleshooting page](https://kulshekhar.github.io/ts-jest/user/troubleshooting)

package/dist/compiler.js

@@ -42,6 +42,7 @@ var bs_logger_1 = require("bs-logger");
 var bufferFrom = require("buffer-from");
 var stableStringify = require("fast-json-stable-stringify");
 var fs_1 = require("fs");
+var build_1 = require("jest-config/build");
 var memoize = require("lodash.memoize");
 var mkdirp = require("mkdirp");
 var path_1 = require("path");
@@ -112,6 +113,10 @@ function createCompiler(configs) {
             _b.call = null,
             _b);
         var serviceHostTraceCtx = __assign(__assign({}, serviceHostDebugCtx), (_c = {}, _c[bs_logger_1.LogContexts.logLevel] = bs_logger_1.LogLevels.trace, _c));
+        var transformIgnorePattern = (configs.jest.transformIgnorePatterns || build_1.defaults.transformIgnorePatterns)
+            .map(function (pattern) { return build_1.replaceRootDirInPath(configs.rootDir, pattern); })
+            .join('|');
+        var transformIgnoreRegExp_1 = new RegExp(transformIgnorePattern);
         var serviceHost = {
             getScriptFileNames: function () { return Object.keys(memoryCache.versions); },
             getScriptVersion: function (fileName) {
@@ -161,6 +166,13 @@ function createCompiler(configs) {
             if (output.emitSkipped) {
                 throw new TypeError(path_1.relative(cwd, fileName) + ": Emit skipped");
             }
+            if (output.outputFiles.length === 0 && !transformIgnoreRegExp_1.test(fileName)) {
+                var normalizedFileName = path_1.normalize(fileName);
+                if (!hasOwn.call(memoryCache.versions, normalizedFileName)) {
+                    memoryCache.versions[normalizedFileName] = 0;
+                }
+                output = service_1.getEmitOutput(fileName);
+            }
             if (output.outputFiles.length === 0) {
                 throw new TypeError(messages_1.interpolate(messages_1.Errors.UnableToRequireDefinitionFile, {
                     file: path_1.basename(fileName),

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

@@ -1,4 +1,4 @@
-/// <reference types="jest" />
+import { Config } from '@jest/types';
 import { Logger } from 'bs-logger';
 import { CompilerOptions, CustomTransformers, ParsedCommandLine } from 'typescript';
 import { AstTransformerDesc, BabelConfig, BabelJestTransformer, TTypeScript, TsCompiler, TsJestConfig, TsJestGlobalOptions, TsJestHooksMap } from '../types';
@@ -6,12 +6,11 @@ export declare class ConfigSet {
     readonly parentOptions?: TsJestGlobalOptions | undefined;
     get projectPackageJson(): Record<string, any>;
     get projectDependencies(): Record<string, string>;
-    get jest(): jest.ProjectConfig;
+    get jest(): Config.ProjectConfig;
     get tsJest(): TsJestConfig;
     get typescript(): ParsedCommandLine;
     get tsconfig(): any;
     get versions(): Record<string, string>;
-    private static loadConfig;
     get babel(): BabelConfig | undefined;
     get compilerModule(): TTypeScript;
     get babelJestTransformer(): BabelJestTransformer | undefined;
@@ -28,7 +27,7 @@ export declare class ConfigSet {
     get tsJestDigest(): string;
     get cacheKey(): string;
     readonly logger: Logger;
-    constructor(jestConfig: jest.ProjectConfig, parentOptions?: TsJestGlobalOptions | undefined, parentLogger?: Logger);
+    constructor(jestConfig: Config.ProjectConfig, parentOptions?: TsJestGlobalOptions | undefined, parentLogger?: Logger);
     resolvePath(inputPath: string, { throwIfMissing, nodeResolve }?: {
         throwIfMissing?: boolean;
         nodeResolve?: boolean;

package/dist/config/config-set.js

@@ -52,7 +52,6 @@ var bs_logger_1 = require("bs-logger");
 var fs_1 = require("fs");
 var json5 = require("json5");
 var path_1 = require("path");
-var semver = require("semver");
 var __1 = require("..");
 var compiler_1 = require("../compiler");
 var transformers_1 = require("../transformers");
@@ -177,9 +176,10 @@ var ConfigSet = (function () {
     });
     Object.defineProperty(ConfigSet.prototype, "jest", {
         get: function () {
+            var _a;
             var config = backports_1.backportJestConfig(this.logger, this._jestConfig);
             if (this.parentOptions) {
-                var globals = config.globals || (config.globals = {});
+                var globals = (_a = config.globals, (_a !== null && _a !== void 0 ? _a : {}));
                 globals['ts-jest'] = __assign(__assign({}, this.parentOptions), globals['ts-jest']);
             }
             this.logger.debug({ jestConfig: config }, 'normalized jest config');
@@ -299,7 +299,8 @@ var ConfigSet = (function () {
                 modules.push('@babel/core', 'babel-jest');
             }
             return modules.reduce(function (map, name) {
-                map[name] = get_package_version_1.getPackageVersion(name) || '-';
+                var _a;
+                map[name] = (_a = get_package_version_1.getPackageVersion(name), (_a !== null && _a !== void 0 ? _a : '-'));
                 return map;
             }, { 'ts-jest': __1.version });
         },
@@ -325,7 +326,7 @@ var ConfigSet = (function () {
             return function (diagnostics, filePath, logger) {
                 if (logger === void 0) { logger = _this.logger; }
                 var filteredDiagnostics = filterDiagnostics(diagnostics, filePath);
-                if (filteredDiagnostics.length === 0)
+                if (!filteredDiagnostics.length)
                     return;
                 var error = createTsError(filteredDiagnostics);
                 var importantCategories = [DiagnosticCategory.Warning, DiagnosticCategory.Error];
@@ -338,19 +339,6 @@ var ConfigSet = (function () {
         enumerable: true,
         configurable: true
     });
-    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.satisfies(version, '>=6 <7')) {
-            delete base.cwd;
-        }
-        if (typeof loadPartialConfig === 'function') {
-            var partialConfig = loadPartialConfig(base);
-            if (partialConfig) {
-                return partialConfig.options;
-            }
-        }
-        return new OptionManager().init(base);
-    };
     Object.defineProperty(ConfigSet.prototype, "babel", {
         get: function () {
             var babelConfig = this.tsJest.babelConfig;
@@ -372,9 +360,8 @@ var ConfigSet = (function () {
             else if (babelConfig.kind === 'inline') {
                 base = __assign(__assign({}, base), babelConfig.value);
             }
-            var config = ConfigSet.loadConfig(base);
-            this.logger.debug({ babelConfig: config }, 'normalized babel config');
-            return config;
+            this.logger.debug({ babelConfig: base }, 'normalized babel config via ts-jest option');
+            return base;
         },
         enumerable: true,
         configurable: true
@@ -440,7 +427,8 @@ var ConfigSet = (function () {
                 if (filePath && !shouldReportDiagnostic(filePath))
                     return [];
                 return diagnostics.filter(function (diagnostic) {
-                    if (diagnostic.file && diagnostic.file.fileName && !shouldReportDiagnostic(diagnostic.file.fileName)) {
+                    var _a;
+                    if (((_a = diagnostic.file) === null || _a === void 0 ? void 0 : _a.fileName) && !shouldReportDiagnostic(diagnostic.file.fileName)) {
                         return false;
                     }
                     return ignoreCodes.indexOf(diagnostic.code) === -1;
@@ -563,13 +551,6 @@ var ConfigSet = (function () {
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(ConfigSet.prototype, "isDoctoring", {
-        get: function () {
-            return !!process.env.TS_JEST_DOCTOR;
-        },
-        enumerable: true,
-        configurable: true
-    });
     Object.defineProperty(ConfigSet.prototype, "tsJestDigest", {
         get: function () {
             return __1.digest;

package/dist/config/create-jest-preset.d.ts

@@ -1,10 +1,10 @@
-/// <reference types="jest" />
+import { Config } from '@jest/types';
 export interface TsJestPresets {
-    transform: Record<string, string>;
+    transform: Config.InitialOptions['transform'];
     testMatch?: string[];
     moduleFileExtensions?: string[];
 }
 export interface CreateJestPresetOptions {
     allowJs?: boolean;
 }
-export declare function createJestPreset({ allowJs }?: CreateJestPresetOptions, from?: jest.InitialOptions): TsJestPresets;
+export declare function createJestPreset({ allowJs }?: CreateJestPresetOptions, from?: Config.InitialOptions): TsJestPresets;

package/dist/transformers/hoist-jest.js

@@ -21,20 +21,21 @@ var __spread = (this && this.__spread) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var bs_logger_1 = require("bs-logger");
-var HOIST_METHODS = ['mock', 'unmock', 'enableAutomock', 'disableAutomock'];
+var HOIST_METHODS = ['mock', 'unmock', 'enableAutomock', 'disableAutomock', 'deepUnmock'];
 exports.name = 'hoisting-jest-mock';
 exports.version = 1;
 function factory(cs) {
     var logger = cs.logger.child({ namespace: 'ts-hoisting' });
     var ts = cs.compilerModule;
+    function shouldHoistExpression(expression) {
+        return (ts.isCallExpression(expression) &&
+            ts.isPropertyAccessExpression(expression.expression) &&
+            HOIST_METHODS.includes(expression.expression.name.text) &&
+            ((ts.isIdentifier(expression.expression.expression) && expression.expression.expression.text === 'jest') ||
+                shouldHoistExpression(expression.expression.expression)));
+    }
     function shouldHoistNode(node) {
-        return (ts.isExpressionStatement(node) &&
-            ts.isCallExpression(node.expression) &&
-            ts.isPropertyAccessExpression(node.expression.expression) &&
-            ts.isIdentifier(node.expression.expression.expression) &&
-            node.expression.expression.expression.text === 'jest' &&
-            ts.isIdentifier(node.expression.expression.name) &&
-            HOIST_METHODS.includes(node.expression.expression.name.text));
+        return ts.isExpressionStatement(node) && shouldHoistExpression(node.expression);
     }
     function createVisitor(ctx, _) {
         var level = 0;

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

@@ -1,15 +1,16 @@
-/// <reference types="jest" />
+import { TransformOptions, TransformedSource, Transformer } from '@jest/transform/build/types';
+import { Config } from '@jest/types';
 import { Logger } from 'bs-logger';
 import { ConfigSet } from './config/config-set';
 import { TsJestGlobalOptions } from './types';
-export declare class TsJestTransformer implements jest.Transformer {
+export declare class TsJestTransformer implements Transformer {
     static get lastTransformerId(): number;
     readonly logger: Logger;
     readonly id: number;
     readonly options: TsJestGlobalOptions;
     constructor(baseOptions?: TsJestGlobalOptions);
-    configsFor(jestConfig: jest.ProjectConfig | string): ConfigSet;
-    process(input: string, filePath: jest.Path, jestConfig: jest.ProjectConfig, transformOptions?: jest.TransformOptions): jest.TransformedSource | string;
+    configsFor(jestConfig: Config.ProjectConfig | string): ConfigSet;
+    process(input: string, filePath: Config.Path, jestConfig: Config.ProjectConfig, transformOptions?: TransformOptions): TransformedSource | string;
     getCacheKey(fileContent: string, filePath: string, jestConfigStr: string, transformOptions?: {
         instrument?: boolean;
         rootDir?: string;

package/dist/types.d.ts

@@ -1,13 +1,13 @@
-/// <reference types="jest" />
+import { TransformedSource, Transformer } from '@jest/transform/build/types';
 import * as _babel from 'babel__core';
 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;
-export declare type TBabelJest = Required<jest.Transformer>;
+export declare type TBabelJest = Required<Transformer>;
 export declare type BabelJestTransformer = {
-    [K in Exclude<keyof jest.Transformer, 'createTransformer'>]: Exclude<jest.Transformer[K], undefined>;
+    [K in Exclude<keyof Transformer, 'createTransformer'>]: Exclude<Transformer[K], undefined>;
 };
 export declare type BabelConfig = _babel.TransformOptions;
 export interface TsJestGlobalOptions {
@@ -18,7 +18,7 @@ export interface TsJestGlobalOptions {
     astTransformers?: string[];
     diagnostics?: boolean | {
         pretty?: boolean;
-        ignoreCodes?: number | string | Array<number | string>;
+        ignoreCodes?: number | string | (number | string)[];
         pathRegex?: RegExp | string;
         warnOnly?: boolean;
     };
@@ -70,7 +70,7 @@ export interface TsJestConfig {
     stringifyContentPathRegex: TsJestConfig$stringifyContentPathRegex;
 }
 export interface TsJestHooksMap {
-    afterProcess?(args: any[], result: string | jest.TransformedSource): string | jest.TransformedSource | void;
+    afterProcess?(args: any[], result: string | TransformedSource): string | TransformedSource | void;
 }
 export interface TSCommon {
     version: typeof _ts.version;
@@ -107,7 +107,4 @@ export interface AstTransformerDesc {
     version: number;
     factory(cs: ConfigSet): TransformerFactory<SourceFile>;
 }
-export interface IPackageJson {
-    main: string;
-}
 export {};

package/dist/util/importer.js

@@ -177,15 +177,20 @@ function requireWrapper(moduleName) {
     }
     var result = { exists: exists, path: path, given: moduleName };
     try {
-        result.exports = requireModule(moduleName);
+        result.exports = requireModule(path);
     }
     catch (error) {
-        result.error = error;
+        try {
+            result.exports = requireModule(moduleName);
+        }
+        catch (error) {
+            result.error = error;
+        }
     }
     return result;
 }
 var requireModule = function (mod) { return require(mod); };
-var resolveModule = function (mod) { return require.resolve(mod); };
+var resolveModule = function (mod) { return require.resolve(mod, { paths: [process.cwd(), __dirname] }); };
 function __requireModule(localRequire, localResolve) {
     requireModule = localRequire;
     resolveModule = localResolve;

package/dist/util/version-checkers.js

@@ -7,9 +7,9 @@ var messages_1 = require("./messages");
 var logger = logger_1.rootLogger.child({ namespace: 'versions' });
 var ExpectedVersions;
 (function (ExpectedVersions) {
-    ExpectedVersions["Jest"] = ">=24 <25";
+    ExpectedVersions["Jest"] = ">=25 <26";
     ExpectedVersions["TypeScript"] = ">=2.7 <4";
-    ExpectedVersions["BabelJest"] = ">=24 <25";
+    ExpectedVersions["BabelJest"] = ">=25 <26";
     ExpectedVersions["BabelCore"] = ">=7.0.0-beta.0 <8";
 })(ExpectedVersions = exports.ExpectedVersions || (exports.ExpectedVersions = {}));
 exports.VersionCheckers = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "24.3.0",
+  "version": "25.2.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": "cli.js",
@@ -15,8 +15,10 @@
     "test": "run-s -s test:e2e \"test:unit -- {@}\" --",
     "test:prepare": "npm run test:e2e -- --prepareOnly",
     "test:e2e": "node scripts/e2e.js",
+    "test:e2e:update-snaphots": "node scripts/e2e.js --updateSnapshot",
     "test:unit": "node_modules/.bin/jest",
     "test:external": "node scripts/test-external-project.js",
+    "test:monorepo": "npm run test:external monorepo",
     "lint": "run-s lint:ts lint:js",
     "lint:js": "node_modules/.bin/eslint . -f stylish",
     "lint:ts": "node_modules/.bin/tslint -t stylish --project .",
@@ -49,7 +51,9 @@
   ],
   "author": "Kulshekhar Kabra <kulshekhar@users.noreply.github.com> (https://github.com/kulshekhar)",
   "contributors": [
-    "Huafu Gandon <huafu.gandon@gmail.com> (https://github.com/huafu)"
+    "Huafu Gandon <huafu.gandon@gmail.com> (https://github.com/huafu)",
+    "Anh Pham <anhpnnd@gmail.com> (https://github.com/ahnpnl)",
+    "Gustav Wengel <gustavwengel@gmail.com> (https://github.com/GeeWee)"
   ],
   "license": "MIT",
   "bugs": {
@@ -60,16 +64,16 @@
     "bs-logger": "0.x",
     "buffer-from": "1.x",
     "fast-json-stable-stringify": "2.x",
-    "lodash.memoize": "4.x",
     "json5": "2.x",
+    "lodash.memoize": "4.x",
     "make-error": "1.x",
     "mkdirp": "0.x",
     "resolve": "1.x",
     "semver": "^5.5",
-    "yargs-parser": "10.x"
+    "yargs-parser": "^16.1.0"
   },
   "peerDependencies": {
-    "jest": ">=24 <25"
+    "jest": ">=25 <26"
   },
   "husky": {
     "hooks": {
@@ -81,11 +85,13 @@
   "devDependencies": {
     "@commitlint/cli": "8.x",
     "@commitlint/config-conventional": "7.x",
+    "@jest/transform": "25.x",
+    "@jest/types": "25.x",
     "@types/babel__core": "7.x",
     "@types/buffer-from": "latest",
     "@types/cross-spawn": "latest",
     "@types/fs-extra": "latest",
-    "@types/jest": "23.x",
+    "@types/jest": "25.x",
     "@types/js-yaml": "latest",
     "@types/json5": "latest",
     "@types/lodash.memoize": "4.x",
@@ -96,13 +102,14 @@
     "@types/resolve": "latest",
     "@types/semver": "latest",
     "@types/yargs": "latest",
+    "@types/yargs-parser": "^15.0.0",
     "conventional-changelog-cli": "2.x",
     "cross-spawn": "latest",
     "eslint": "latest",
     "fs-extra": "latest",
     "glob-gitignore": "latest",
-    "husky": "1.x",
-    "jest": "24.x",
+    "husky": "3.x",
+    "jest": "25.x",
     "js-yaml": "latest",
     "lint-staged": "latest",
     "lodash.merge": "4.x",