ts-jest 25.2.0 → 25.2.1

package/.ts-jest-digest

@@ -1 +1 @@
-35ae96df88417ec4b77b95e0ac77f17d1e091ad1
+6982d3f1883cd9adc2334b36b70c6625ec327569

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+<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)
 

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.js

@@ -176,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');
@@ -298,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 });
         },
@@ -324,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];
@@ -425,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;
@@ -548,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/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/types.d.ts

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "25.2.0",
+  "version": "25.2.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": "cli.js",
@@ -18,6 +18,7 @@
     "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 .",
@@ -50,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": {
@@ -61,13 +64,13 @@
     "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": ">=25 <26"
@@ -99,12 +102,13 @@
     "@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",
+    "husky": "3.x",
     "jest": "25.x",
     "js-yaml": "latest",
     "lint-staged": "latest",