ts-jest 28.0.4 → 28.0.5

package/.ts-jest-digest

@@ -1 +1 @@
-3ec913f3824bb3d8e0a11ca9d34fe5f15cb00d40
+60d8111ee0c613e292a844a081abf56c285c9036

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [28.0.5](https://github.com/kulshekhar/ts-jest/compare/v28.0.4...v28.0.5) (2022-06-11)
+
+
+### Bug Fixes
+
+* **legacy:** throw type check error in ESM mode with `reject` ([#3618](https://github.com/kulshekhar/ts-jest/issues/3618)) ([7dd01ff](https://github.com/kulshekhar/ts-jest/commit/7dd01ffe0c7ad3add87b11227964544f2586355a)), closes [#3507](https://github.com/kulshekhar/ts-jest/issues/3507)
+
+
+
 ## [28.0.4](https://github.com/kulshekhar/ts-jest/compare/v28.0.3...v28.0.4) (2022-06-02)
 
 

package/dist/legacy/compiler/ts-compiler.d.ts

@@ -1,7 +1,7 @@
-import type { TransformedSource } from '@jest/transform';
 import { Logger } from 'bs-logger';
 import type { CompilerOptions, CustomTransformers, Program, TranspileOutput } from 'typescript';
 import type { StringMap, TsCompilerInstance, TsJestAstTransformer, TsJestCompileOptions, TTypeScript } from '../../types';
+import { CompiledOutput } from '../../types';
 import type { ConfigSet } from '../config/config-set';
 export declare class TsCompiler implements TsCompilerInstance {
     readonly configSet: ConfigSet;
@@ -15,7 +15,7 @@ export declare class TsCompiler implements TsCompilerInstance {
     program: Program | undefined;
     constructor(configSet: ConfigSet, runtimeCacheFS: StringMap);
     getResolvedModules(fileContent: string, fileName: string, runtimeCacheFS: StringMap): string[];
-    getCompiledOutput(fileContent: string, fileName: string, options: TsJestCompileOptions): TransformedSource;
+    getCompiledOutput(fileContent: string, fileName: string, options: TsJestCompileOptions): CompiledOutput;
     protected _transpileOutput(fileContent: string, fileName: string): TranspileOutput;
     protected _makeTransformers(customTransformers: TsJestAstTransformer): CustomTransformers;
 }

package/dist/legacy/compiler/ts-compiler.js

@@ -107,10 +107,12 @@ var TsCompiler = (function () {
         return importedModulePaths;
     };
     TsCompiler.prototype.getCompiledOutput = function (fileContent, fileName, options) {
+        var e_1, _a;
         var moduleKind = this._initialCompilerOptions.module;
         var esModuleInterop = this._initialCompilerOptions.esModuleInterop;
         var allowSyntheticDefaultImports = this._initialCompilerOptions.allowSyntheticDefaultImports;
         var currentModuleKind = this._compilerOptions.module;
+        var isEsmMode = this.configSet.useESM && options.supportsStaticESM;
         if ((this.configSet.babelJestTransformer || (!this.configSet.babelJestTransformer && options.supportsStaticESM)) &&
             this.configSet.useESM) {
             moduleKind =
@@ -130,7 +132,33 @@ var TsCompiler = (function () {
             this._logger.debug({ fileName: fileName }, 'getCompiledOutput(): compiling using language service');
             this._updateMemoryCache(fileContent, fileName, currentModuleKind === moduleKind);
             var output = this._languageService.getEmitOutput(fileName);
-            this._doTypeChecking(fileName, options.depGraphs, options.watchMode);
+            var diagnostics = this.getDiagnostics(fileName);
+            if (!isEsmMode && diagnostics.length) {
+                this.configSet.raiseDiagnostics(diagnostics, fileName, this._logger);
+                if (options.watchMode) {
+                    this._logger.debug({ fileName: fileName }, '_doTypeChecking(): starting watch mode computing diagnostics');
+                    try {
+                        for (var _b = __values(options.depGraphs.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                            var entry = _c.value;
+                            var normalizedModuleNames = entry[1].resolvedModuleNames.map(function (moduleName) { return (0, path_1.normalize)(moduleName); });
+                            var fileToReTypeCheck = entry[0];
+                            if (normalizedModuleNames.includes(fileName) && this.configSet.shouldReportDiagnostics(fileToReTypeCheck)) {
+                                this._logger.debug({ fileToReTypeCheck: fileToReTypeCheck }, '_doTypeChecking(): computing diagnostics using language service');
+                                this._updateMemoryCache(this._getFileContentFromCache(fileToReTypeCheck), fileToReTypeCheck);
+                                var importedModulesDiagnostics = __spreadArray(__spreadArray([], __read(this._languageService.getSemanticDiagnostics(fileToReTypeCheck)), false), __read(this._languageService.getSyntacticDiagnostics(fileToReTypeCheck)), false);
+                                this.configSet.raiseDiagnostics(importedModulesDiagnostics, fileName, this._logger);
+                            }
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
+                }
+            }
             if (output.emitSkipped) {
                 if (constants_1.TS_TSX_REGEX.test(fileName)) {
                     throw new Error((0, messages_1.interpolate)("Unable to process '{{file}}', please make sure that `outDir` in your tsconfig is neither `''` or `'.'`. You can also configure Jest config option `transformIgnorePatterns` to inform `ts-jest` to transform {{file}}", { file: fileName }));
@@ -151,9 +179,11 @@ var TsCompiler = (function () {
             return this._compilerOptions.sourceMap
                 ? {
                     code: (0, compiler_utils_1.updateOutput)(outputFiles[1].text, fileName, outputFiles[0].text),
+                    diagnostics: diagnostics,
                 }
                 : {
                     code: (0, compiler_utils_1.updateOutput)(outputFiles[0].text, fileName),
+                    diagnostics: diagnostics,
                 };
         }
         else {
@@ -191,6 +221,7 @@ var TsCompiler = (function () {
     };
     TsCompiler.prototype._createLanguageService = function () {
         var _this = this;
+        var _a;
         this._parsedTsConfig.fileNames
             .filter(function (fileName) { return constants_1.TS_TSX_REGEX.test(fileName) && !_this.configSet.isTestFile(fileName); })
             .forEach(function (fileName) { return _this._fileVersionCache.set(fileName, 0); });
@@ -220,7 +251,7 @@ var TsCompiler = (function () {
                 return _this._ts.ScriptSnapshot.fromString(contents);
             },
             fileExists: (0, lodash_memoize_1.default)(this._ts.sys.fileExists),
-            readFile: this._cachedReadFile,
+            readFile: (_a = this._cachedReadFile) !== null && _a !== void 0 ? _a : this._ts.sys.readFile,
             readDirectory: (0, lodash_memoize_1.default)(this._ts.sys.readDirectory),
             getDirectories: (0, lodash_memoize_1.default)(this._ts.sys.getDirectories),
             directoryExists: (0, lodash_memoize_1.default)(this._ts.sys.directoryExists),
@@ -290,36 +321,13 @@ var TsCompiler = (function () {
         if (shouldIncrementProjectVersion)
             this._projectVersion++;
     };
-    TsCompiler.prototype._doTypeChecking = function (fileName, depGraphs, watchMode) {
-        var e_1, _a;
+    TsCompiler.prototype.getDiagnostics = function (fileName) {
+        var diagnostics = [];
         if (this.configSet.shouldReportDiagnostics(fileName)) {
             this._logger.debug({ fileName: fileName }, '_doTypeChecking(): computing diagnostics using language service');
-            var diagnostics = __spreadArray(__spreadArray([], __read(this._languageService.getSemanticDiagnostics(fileName)), false), __read(this._languageService.getSyntacticDiagnostics(fileName)), false);
-            this.configSet.raiseDiagnostics(diagnostics, fileName, this._logger);
-        }
-        if (watchMode) {
-            this._logger.debug({ fileName: fileName }, '_doTypeChecking(): starting watch mode computing diagnostics');
-            try {
-                for (var _b = __values(depGraphs.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var entry = _c.value;
-                    var normalizedModuleNames = entry[1].resolvedModuleNames.map(function (moduleName) { return (0, path_1.normalize)(moduleName); });
-                    var fileToReTypeCheck = entry[0];
-                    if (normalizedModuleNames.includes(fileName) && this.configSet.shouldReportDiagnostics(fileToReTypeCheck)) {
-                        this._logger.debug({ fileToReTypeCheck: fileToReTypeCheck }, '_doTypeChecking(): computing diagnostics using language service');
-                        this._updateMemoryCache(this._getFileContentFromCache(fileToReTypeCheck), fileToReTypeCheck);
-                        var importedModulesDiagnostics = __spreadArray(__spreadArray([], __read(this._languageService.getSemanticDiagnostics(fileToReTypeCheck)), false), __read(this._languageService.getSyntacticDiagnostics(fileToReTypeCheck)), false);
-                        this.configSet.raiseDiagnostics(importedModulesDiagnostics, fileName, this._logger);
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
+            diagnostics.push.apply(diagnostics, __spreadArray(__spreadArray([], __read(this._languageService.getSemanticDiagnostics(fileName)), false), __read(this._languageService.getSyntacticDiagnostics(fileName)), false));
         }
+        return diagnostics;
     };
     return TsCompiler;
 }());

package/dist/legacy/compiler/ts-jest-compiler.d.ts

@@ -1,9 +1,8 @@
-import type { TransformedSource } from '@jest/transform';
-import type { CompilerInstance, StringMap, TsJestCompileOptions } from '../../types';
+import type { CompilerInstance, CompiledOutput, StringMap, TsJestCompileOptions } from '../../types';
 import type { ConfigSet } from '../config/config-set';
 export declare class TsJestCompiler implements CompilerInstance {
     private readonly _compilerInstance;
     constructor(configSet: ConfigSet, runtimeCacheFS: StringMap);
     getResolvedModules(fileContent: string, fileName: string, runtimeCacheFS: StringMap): string[];
-    getCompiledOutput(fileContent: string, fileName: string, options: TsJestCompileOptions): TransformedSource;
+    getCompiledOutput(fileContent: string, fileName: string, options: TsJestCompileOptions): CompiledOutput;
 }

package/dist/legacy/config/config-set.js

@@ -457,7 +457,7 @@ var ConfigSet = (function () {
             });
         if (!filteredDiagnostics.length)
             return;
-        var error = this._createTsError(filteredDiagnostics);
+        var error = this.createTsError(filteredDiagnostics);
         var importantCategories = [DiagnosticCategory.Warning, DiagnosticCategory.Error];
         if (this._diagnostics.throws && filteredDiagnostics.some(function (d) { return importantCategories.includes(d.category); })) {
             throw error;
@@ -470,7 +470,7 @@ var ConfigSet = (function () {
             ? this.parsedTsConfig.options.checkJs && !this._shouldIgnoreDiagnosticsForFile(filePath)
             : !this._shouldIgnoreDiagnosticsForFile(filePath);
     };
-    ConfigSet.prototype._createTsError = function (diagnostics) {
+    ConfigSet.prototype.createTsError = function (diagnostics) {
         var _this = this;
         var formatDiagnostics = this._diagnostics.pretty
             ? this.compilerModule.formatDiagnosticsWithColorAndContext

package/dist/legacy/ts-jest-transformer.js

@@ -157,7 +157,9 @@ var TsJestTransformer = (function () {
         var configs = this._configsFor(transformOptions);
         var shouldStringifyContent = configs.shouldStringifyContent(sourcePath);
         var babelJest = shouldStringifyContent ? undefined : configs.babelJestTransformer;
-        var result = this.processWithTs(sourceText, sourcePath, transformOptions);
+        var result = {
+            code: this.processWithTs(sourceText, sourcePath, transformOptions).code,
+        };
         if (babelJest) {
             this._logger.debug({ fileName: sourcePath }, 'calling babel-jest processor');
             result = babelJest.process(result.code, sourcePath, __assign(__assign({}, transformOptions), { instrument: false }));
@@ -170,21 +172,28 @@ var TsJestTransformer = (function () {
             var _this = this;
             return __generator(this, function (_a) {
                 this._logger.debug({ fileName: sourcePath, transformOptions: transformOptions }, 'processing', sourcePath);
-                return [2, new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
-                        var configs, shouldStringifyContent, babelJest, result;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
+                return [2, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
+                        var configs, shouldStringifyContent, babelJest, result, processWithTsResult;
+                        var _a;
+                        return __generator(this, function (_b) {
+                            switch (_b.label) {
                                 case 0:
                                     configs = this._configsFor(transformOptions);
                                     shouldStringifyContent = configs.shouldStringifyContent(sourcePath);
                                     babelJest = shouldStringifyContent ? undefined : configs.babelJestTransformer;
-                                    result = this.processWithTs(sourceText, sourcePath, transformOptions);
+                                    processWithTsResult = this.processWithTs(sourceText, sourcePath, transformOptions);
+                                    result = {
+                                        code: processWithTsResult.code,
+                                    };
+                                    if ((_a = processWithTsResult.diagnostics) === null || _a === void 0 ? void 0 : _a.length) {
+                                        reject(configs.createTsError(processWithTsResult.diagnostics));
+                                    }
                                     if (!babelJest) return [3, 2];
                                     this._logger.debug({ fileName: sourcePath }, 'calling babel-jest processor');
                                     return [4, babelJest.processAsync(result.code, sourcePath, __assign(__assign({}, transformOptions), { instrument: false }))];
                                 case 1:
-                                    result = _a.sent();
-                                    _a.label = 2;
+                                    result = _b.sent();
+                                    _b.label = 2;
                                 case 2:
                                     result = this.runTsJestHook(sourcePath, sourceText, transformOptions, result);
                                     resolve(result);
@@ -292,9 +301,8 @@ var TsJestTransformer = (function () {
     };
     TsJestTransformer.prototype.getCacheKeyAsync = function (sourceText, sourcePath, transformOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
             return __generator(this, function (_a) {
-                return [2, new Promise(function (resolve) { return resolve(_this.getCacheKey(sourceText, sourcePath, transformOptions)); })];
+                return [2, Promise.resolve(this.getCacheKey(sourceText, sourcePath, transformOptions))];
             });
         });
     };

package/dist/types.d.ts

@@ -79,9 +79,12 @@ export interface TsJestCompileOptions {
     watchMode: boolean;
     supportsStaticESM: boolean;
 }
+export interface CompiledOutput extends TransformedSource {
+    diagnostics?: _ts.Diagnostic[];
+}
 export interface CompilerInstance {
     getResolvedModules(fileContent: string, fileName: string, runtimeCacheFS: StringMap): string[];
-    getCompiledOutput(fileContent: string, fileName: string, options: TsJestCompileOptions): TransformedSource;
+    getCompiledOutput(fileContent: string, fileName: string, options: TsJestCompileOptions): CompiledOutput;
 }
 export interface TsCompilerInstance extends CompilerInstance {
     configSet: ConfigSet;

package/globals.d.ts

@@ -0,0 +1,18 @@
+declare global {
+  const beforeAll: typeof import('@jest/globals').beforeAll
+  const beforeEach: typeof import('@jest/globals').beforeEach
+  const afterAll: typeof import('@jest/globals').afterAll
+  const afterEach: typeof import('@jest/globals').afterEach
+  const describe: typeof import('@jest/globals').describe
+  const fdescribe: typeof import('@jest/globals').fdescribe
+  const xdescribe: typeof import('@jest/globals').xdescribe
+  const it: typeof import('@jest/globals').it
+  const fit: typeof import('@jest/globals').fit
+  const xit: typeof import('@jest/globals').xit
+  const test: typeof import('@jest/globals').test
+  const xtest: typeof import('@jest/globals').xtest
+  const expect: typeof import('@jest/globals').expect
+  const jest: typeof import('@jest/globals').jest
+}
+
+export {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "28.0.4",
+  "version": "28.0.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -58,7 +58,7 @@
     "lodash.memoize": "4.x",
     "make-error": "1.x",
     "semver": "7.x",
-    "yargs-parser": "^20.x"
+    "yargs-parser": "^21.0.1"
   },
   "peerDependencies": {
     "@babel/core": ">=7.0.0-beta.0 <8",
@@ -87,12 +87,11 @@
   "devDependencies": {
     "@commitlint/cli": "17.x",
     "@commitlint/config-angular": "^17.0.0",
-    "@jest/transform": "^28.0.0",
-    "@jest/types": "^28.0.0",
+    "@jest/transform": "^28.1.1",
+    "@jest/types": "^28.1.1",
     "@types/babel__core": "7.x",
     "@types/cross-spawn": "latest",
     "@types/fs-extra": "latest",
-    "@types/jest": "^27.0.3",
     "@types/js-yaml": "latest",
     "@types/lodash.camelcase": "4.x",
     "@types/lodash.memoize": "4.x",
@@ -104,13 +103,14 @@
     "@types/rimraf": "^3.0.2",
     "@types/semver": "latest",
     "@types/yargs": "latest",
-    "@types/yargs-parser": "20.x",
-    "@typescript-eslint/eslint-plugin": "^5.3.0",
-    "@typescript-eslint/parser": "^5.3.0",
+    "@types/yargs-parser": "21.x",
+    "@typescript-eslint/eslint-plugin": "^5.27.1",
+    "@typescript-eslint/parser": "^5.27.1",
+    "babel-jest": "^28.1.1",
     "conventional-changelog-cli": "2.x",
     "cross-spawn": "latest",
-    "esbuild": "~0.14.42",
-    "eslint": "^8.4.1",
+    "esbuild": "~0.14.43",
+    "eslint": "^8.17.0",
     "eslint-config-prettier": "latest",
     "eslint-plugin-import": "latest",
     "eslint-plugin-jest": "latest",
@@ -122,16 +122,16 @@
     "glob": "^8.0.3",
     "glob-gitignore": "latest",
     "husky": "4.x",
-    "jest": "^28.0.0",
+    "jest": "^28.1.1",
     "jest-snapshot-serializer-raw": "^1.2.0",
     "js-yaml": "latest",
-    "json-schema-to-typescript": "^10.1.4",
+    "json-schema-to-typescript": "^10.1.5",
     "lint-staged": "latest",
     "lodash.camelcase": "^4.3.0",
     "lodash.set": "^4.3.2",
-    "node-fetch": "^3.0.0",
-    "prettier": "^2.4.0",
-    "typescript": "~4.6.2"
+    "node-fetch": "^3.2.6",
+    "prettier": "^2.6.2",
+    "typescript": "~4.7.3"
   },
   "lint-staged": {
     "*.{ts,tsx,js,jsx}": [

package/renovate.json

@@ -1,11 +1,11 @@
 {
   "extends": [
-    ":dependencyDashboard",
     "group:babelMonorepo",
     "group:commitlintMonorepo",
     "group:docusaurusMonorepo",
     ":prHourlyLimit2",
-    "workarounds:all"
+    "workarounds:all",
+    "helpers:pinGitHubActionDigests"
   ],
   "timezone": "UTC",
   "rangeStrategy": "bump",
@@ -53,10 +53,7 @@
     },
     {
       "matchPaths": ["e2e/**"],
-      "matchPackageNames": [
-        "react",
-        "react-intl"
-      ],
+      "matchPackagePatterns": ["react"],
       "groupName": "React e2e packages",
       "enabled": true
     },