ts-jest 29.1.1 → 29.1.3

package/.ts-jest-digest

@@ -1 +1 @@
-b3b0008986ac15bb8a6bdd80c9102577ea718871
+119b6863ec1b60a4ccead1725443bf8562134c2a

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## [29.1.3](https://github.com/kulshekhar/ts-jest/compare/v29.1.2...v29.1.3) (2024-05-21)
+
+
+### Bug Fixes
+
+* add `@jest/transform` as an optional peer dependency ([0ba7f86](https://github.com/kulshekhar/ts-jest/commit/0ba7f861c3e1905de5627b4e5d2a2cadad011b67))
+* bring back Node 14 support ([eda56a7](https://github.com/kulshekhar/ts-jest/commit/eda56a779789d70963b7572e2914b2a3a25ac43a))
+
+
+### Performance Improvements
+
+* remove ts resolved module cache file ([4c88da5](https://github.com/kulshekhar/ts-jest/commit/4c88da58991b000aa90ea489acfa6aed39b36120))
+
+
+
+## [29.1.2](https://github.com/kulshekhar/ts-jest/compare/v29.1.1...v29.1.2) (2024-01-22)
+
+
+### Bug Fixes
+
+* calculated cache key based on `supportsStaticESM` ([a5d6f2d](https://github.com/kulshekhar/ts-jest/commit/a5d6f2d4f4bfa1c7c217f6faf9310958797b436f))
+* correct error handling in `processAsync` ([e7be4bf](https://github.com/kulshekhar/ts-jest/commit/e7be4bf6a863cd76efec28f40fdd5193b2f50bad)), closes [#4207](https://github.com/kulshekhar/ts-jest/issues/4207)
+* use `Config.ProjectConfig` ([918312b](https://github.com/kulshekhar/ts-jest/commit/918312bee22a795ec6bb347f95df4c1ff0a054de)), closes [#4028](https://github.com/kulshekhar/ts-jest/issues/4028)
+
+
+
 ## [29.1.1](https://github.com/kulshekhar/ts-jest/compare/v29.1.0...v29.1.1) (2023-06-23)
 
 

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

@@ -1,7 +1,7 @@
 import { Logger } from 'bs-logger';
 import type * as ts from 'typescript';
 import type { RawCompilerOptions } from '../../raw-compiler-options';
-import type { ProjectConfigTsJest, TsJestAstTransformer, TTypeScript } from '../../types';
+import type { TsJestAstTransformer, TsJestTransformOptions, TTypeScript } from '../../types';
 export declare class ConfigSet {
     readonly parentLogger?: Logger | undefined;
     /**
@@ -18,7 +18,7 @@ export declare class ConfigSet {
     parsedTsConfig: ts.ParsedCommandLine | Record<string, any>;
     resolvedTransformers: TsJestAstTransformer;
     useESM: boolean;
-    constructor(jestConfig: ProjectConfigTsJest | undefined, parentLogger?: Logger | undefined);
+    constructor(jestConfig: TsJestTransformOptions['config'] | undefined, parentLogger?: Logger | undefined);
     /**
      * Load TypeScript configuration. Returns the parsed TypeScript config and any `tsconfig` options specified in ts-jest
      * Subclasses which extend `ConfigSet` can override the default behavior

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

@@ -1,23 +1,22 @@
 import type { SyncTransformer, TransformedSource } from '@jest/transform';
-import type { CompilerInstance, ProjectConfigTsJest, TransformOptionsTsJest, TsJestGlobalOptions } from '../types';
+import type { CompilerInstance, TsJestTransformerOptions, TsJestTransformOptions } from '../types';
 import { ConfigSet } from './config/config-set';
-export declare class TsJestTransformer implements SyncTransformer {
+export declare class TsJestTransformer implements SyncTransformer<TsJestTransformerOptions> {
     private readonly tsJestConfig?;
     private readonly _logger;
     protected _compiler: CompilerInstance;
-    private _tsResolvedModulesCachePath;
     private _transformCfgStr;
     private _depGraphs;
     private _watchMode;
-    constructor(tsJestConfig?: TsJestGlobalOptions | undefined);
+    constructor(tsJestConfig?: import("../types").TsJestGlobalOptions | undefined);
     private _configsFor;
-    protected _createConfigSet(config: ProjectConfigTsJest | undefined): ConfigSet;
+    protected _createConfigSet(config: TsJestTransformOptions['config'] | undefined): ConfigSet;
     protected _createCompiler(configSet: ConfigSet, cacheFS: Map<string, string>): void;
     /**
      * @public
      */
-    process(sourceText: string, sourcePath: string, transformOptions: TransformOptionsTsJest): TransformedSource;
-    processAsync(sourceText: string, sourcePath: string, transformOptions: TransformOptionsTsJest): Promise<TransformedSource>;
+    process(sourceText: string, sourcePath: string, transformOptions: TsJestTransformOptions): TransformedSource;
+    processAsync(sourceText: string, sourcePath: string, transformOptions: TsJestTransformOptions): Promise<TransformedSource>;
     private processWithTs;
     private runTsJestHook;
     /**
@@ -27,10 +26,6 @@ export declare class TsJestTransformer implements SyncTransformer {
      *
      * @public
      */
-    getCacheKey(fileContent: string, filePath: string, transformOptions: TransformOptionsTsJest): string;
-    getCacheKeyAsync(sourceText: string, sourcePath: string, transformOptions: TransformOptionsTsJest): Promise<string>;
-    /**
-     * Subclasses extends `TsJestTransformer` can call this method to get resolved module disk cache
-     */
-    private _getFsCachedResolvedModules;
+    getCacheKey(fileContent: string, filePath: string, transformOptions: TsJestTransformOptions): string;
+    getCacheKeyAsync(sourceText: string, sourcePath: string, transformOptions: TsJestTransformOptions): Promise<string>;
 }

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

@@ -117,7 +117,6 @@ var TsJestTransformer = exports.TsJestTransformer = /** @class */ (function () {
             this._transformCfgStr = ccs.transformerCfgStr;
             this._compiler = ccs.compiler;
             this._depGraphs = ccs.depGraphs;
-            this._tsResolvedModulesCachePath = ccs.tsResolvedModulesCachePath;
             this._watchMode = ccs.watchMode;
             configSet = ccs.configSet;
         }
@@ -133,7 +132,6 @@ var TsJestTransformer = exports.TsJestTransformer = /** @class */ (function () {
                 this._transformCfgStr = serializedCcs.transformerCfgStr;
                 this._compiler = serializedCcs.compiler;
                 this._depGraphs = serializedCcs.depGraphs;
-                this._tsResolvedModulesCachePath = serializedCcs.tsResolvedModulesCachePath;
                 this._watchMode = serializedCcs.watchMode;
                 configSet = serializedCcs.configSet;
             }
@@ -154,7 +152,6 @@ var TsJestTransformer = exports.TsJestTransformer = /** @class */ (function () {
                 jest_1.cacheDirectory = undefined; // eslint-disable-line @typescript-eslint/no-explicit-any
                 this._transformCfgStr = "".concat(new utils_1.JsonableValue(jest_1).serialized).concat(configSet.cacheSuffix);
                 this._createCompiler(configSet, cacheFS);
-                this._getFsCachedResolvedModules(configSet);
                 this._watchMode = process.argv.includes('--watch');
                 TsJestTransformer._cachedConfigSets.push({
                     jestConfig: new utils_1.JsonableValue(config),
@@ -162,7 +159,6 @@ var TsJestTransformer = exports.TsJestTransformer = /** @class */ (function () {
                     transformerCfgStr: this._transformCfgStr,
                     compiler: this._compiler,
                     depGraphs: this._depGraphs,
-                    tsResolvedModulesCachePath: this._tsResolvedModulesCachePath,
                     watchMode: this._watchMode,
                 });
             }
@@ -196,40 +192,34 @@ var TsJestTransformer = exports.TsJestTransformer = /** @class */ (function () {
         return result;
     };
     TsJestTransformer.prototype.processAsync = function (sourceText, sourcePath, transformOptions) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                this._logger.debug({ fileName: sourcePath, transformOptions: transformOptions }, 'processing', sourcePath);
-                return [2 /*return*/, 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;
-                                    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 /*break*/, 2];
-                                    this._logger.debug({ fileName: sourcePath }, 'calling babel-jest processor');
-                                    return [4 /*yield*/, babelJest.processAsync(result.code, sourcePath, __assign(__assign({}, transformOptions), { instrument: false }))];
-                                case 1:
-                                    // do not instrument here, jest will do it anyway afterwards
-                                    result = _b.sent();
-                                    _b.label = 2;
-                                case 2:
-                                    result = this.runTsJestHook(sourcePath, sourceText, transformOptions, result);
-                                    resolve(result);
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
+            var configs, shouldStringifyContent, babelJest, result, processWithTsResult;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        this._logger.debug({ fileName: sourcePath, transformOptions: transformOptions }, 'processing', sourcePath);
+                        configs = this._configsFor(transformOptions);
+                        shouldStringifyContent = configs.shouldStringifyContent(sourcePath);
+                        babelJest = shouldStringifyContent ? undefined : configs.babelJestTransformer;
+                        processWithTsResult = this.processWithTs(sourceText, sourcePath, transformOptions);
+                        result = {
+                            code: processWithTsResult.code,
+                        };
+                        if ((_a = processWithTsResult.diagnostics) === null || _a === void 0 ? void 0 : _a.length) {
+                            throw configs.createTsError(processWithTsResult.diagnostics);
+                        }
+                        if (!babelJest) return [3 /*break*/, 2];
+                        this._logger.debug({ fileName: sourcePath }, 'calling babel-jest processor');
+                        return [4 /*yield*/, babelJest.processAsync(result.code, sourcePath, __assign(__assign({}, transformOptions), { instrument: false }))];
+                    case 1:
+                        // do not instrument here, jest will do it anyway afterwards
+                        result = _b.sent();
+                        _b.label = 2;
+                    case 2:
+                        result = this.runTsJestHook(sourcePath, sourceText, transformOptions, result);
+                        return [2 /*return*/, result];
+                }
             });
         });
     };
@@ -311,7 +301,7 @@ var TsJestTransformer = exports.TsJestTransformer = /** @class */ (function () {
         var configs = this._configsFor(transformOptions);
         this._logger.debug({ fileName: filePath, transformOptions: transformOptions }, 'computing cache key for', filePath);
         // we do not instrument, ensure it is false all the time
-        var instrument = (_a = transformOptions.instrument, _a === void 0 ? false : _a);
+        var supportsStaticESM = transformOptions.supportsStaticESM, instrument = (_a = transformOptions.instrument, _a === void 0 ? false : _a);
         var constructingCacheKeyElements = [
             this._transformCfgStr,
             exports.CACHE_KEY_EL_SEPARATOR,
@@ -319,11 +309,13 @@ var TsJestTransformer = exports.TsJestTransformer = /** @class */ (function () {
             exports.CACHE_KEY_EL_SEPARATOR,
             "instrument:".concat(instrument ? 'on' : 'off'),
             exports.CACHE_KEY_EL_SEPARATOR,
+            "supportsStaticESM:".concat(supportsStaticESM ? 'on' : 'off'),
+            exports.CACHE_KEY_EL_SEPARATOR,
             fileContent,
             exports.CACHE_KEY_EL_SEPARATOR,
             filePath,
         ];
-        if (!configs.isolatedModules && this._tsResolvedModulesCachePath) {
+        if (!configs.isolatedModules && configs.tsCacheDir) {
             var resolvedModuleNames = void 0;
             if (((_b = this._depGraphs.get(filePath)) === null || _b === void 0 ? void 0 : _b.fileContent) === fileContent) {
                 this._logger.debug({ fileName: filePath, transformOptions: transformOptions }, 'getting resolved modules from disk caching or memory caching for', filePath);
@@ -339,7 +331,6 @@ var TsJestTransformer = exports.TsJestTransformer = /** @class */ (function () {
                     fileContent: fileContent,
                     resolvedModuleNames: resolvedModuleNames,
                 });
-                (0, fs_1.writeFileSync)(this._tsResolvedModulesCachePath, (0, utils_1.stringify)(__spreadArray([], __read(this._depGraphs), false)));
             }
             resolvedModuleNames.forEach(function (moduleName) {
                 constructingCacheKeyElements.push(exports.CACHE_KEY_EL_SEPARATOR, moduleName, exports.CACHE_KEY_EL_SEPARATOR, (0, fs_1.statSync)(moduleName).mtimeMs.toString());
@@ -354,22 +345,6 @@ var TsJestTransformer = exports.TsJestTransformer = /** @class */ (function () {
             });
         });
     };
-    /**
-     * Subclasses extends `TsJestTransformer` can call this method to get resolved module disk cache
-     */
-    TsJestTransformer.prototype._getFsCachedResolvedModules = function (configSet) {
-        var cacheDir = configSet.tsCacheDir;
-        if (!configSet.isolatedModules && cacheDir) {
-            // Make sure the cache directory exists before continuing.
-            (0, fs_1.mkdirSync)(cacheDir, { recursive: true });
-            this._tsResolvedModulesCachePath = path_1.default.join(cacheDir, (0, sha1_1.sha1)('ts-jest-resolved-modules', exports.CACHE_KEY_EL_SEPARATOR));
-            try {
-                var cachedTSResolvedModules = (0, fs_1.readFileSync)(this._tsResolvedModulesCachePath, 'utf-8');
-                this._depGraphs = new Map((0, utils_1.parse)(cachedTSResolvedModules));
-            }
-            catch (e) { }
-        }
-    };
     /**
      * cache ConfigSet between test runs
      *

package/dist/types.d.ts

@@ -125,8 +125,8 @@ export interface ProjectConfigTsJest extends Config.ProjectConfig {
 /**
  * @deprecated use `JestConfigWithTsJest` instead
  */
-export interface TransformOptionsTsJest extends TransformOptions {
-    config: ProjectConfigTsJest;
+export interface TransformOptionsTsJest<TransformerConfig = unknown> extends TransformOptions<TransformerConfig> {
+    config: Config.ProjectConfig;
 }
 /**
  * For typings in `jest.config.ts`
@@ -142,6 +142,7 @@ export interface InitialOptionsTsJest extends Config.InitialOptions {
     globals?: GlobalConfigTsJest;
 }
 export type TsJestTransformerOptions = TsJestGlobalOptions;
+export type TsJestTransformOptions = TransformOptions<TsJestTransformerOptions>;
 export interface JestConfigWithTsJest extends Omit<Config.InitialOptions, 'transform'> {
     transform?: {
         [regex: string]: 'ts-jest' | 'ts-jest/legacy' | ['ts-jest', TsJestTransformerOptions] | ['ts-jest/legacy', TsJestTransformerOptions] | string | Config.TransformerConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "29.1.1",
+  "version": "29.1.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -62,6 +62,7 @@
   },
   "peerDependencies": {
     "@babel/core": ">=7.0.0-beta.0 <8",
+    "@jest/transform": "^29.0.0",
     "@jest/types": "^29.0.0",
     "babel-jest": "^29.0.0",
     "jest": "^29.0.0",
@@ -71,6 +72,9 @@
     "@babel/core": {
       "optional": true
     },
+    "@jest/transform": {
+      "optional": true
+    },
     "@jest/types": {
       "optional": true
     },
@@ -91,26 +95,26 @@
   "devDependencies": {
     "@commitlint/cli": "17.x",
     "@commitlint/config-angular": "^17.6.5",
-    "@jest/transform": "^29.5.0",
-    "@jest/types": "^29.5.0",
-    "@types/babel__core": "7.x",
+    "@jest/transform": "^29.7.0",
+    "@jest/types": "^29.6.3",
+    "@types/babel__core": "7.20.5",
     "@types/cross-spawn": "latest",
     "@types/fs-extra": "latest",
     "@types/js-yaml": "latest",
-    "@types/lodash.camelcase": "4.x",
-    "@types/lodash.memoize": "4.x",
-    "@types/lodash.set": "4.x",
-    "@types/micromatch": "4.x",
-    "@types/node": "18.16.18",
+    "@types/lodash.camelcase": "4.3.9",
+    "@types/lodash.memoize": "4.1.9",
+    "@types/lodash.set": "4.3.9",
+    "@types/micromatch": "4.0.7",
+    "@types/node": "18.19.33",
     "@types/react": "18.x",
     "@types/rimraf": "^3.0.2",
     "@types/semver": "latest",
     "@types/yargs": "latest",
-    "@types/yargs-parser": "21.x",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
-    "babel-jest": "^29.5.0",
-    "conventional-changelog-cli": "2.x",
+    "@types/yargs-parser": "21.0.3",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "babel-jest": "^29.7.0",
+    "conventional-changelog-cli": "2.2.2",
     "cross-spawn": "latest",
     "esbuild": "~0.17.19",
     "eslint": "^8.42.0",
@@ -125,14 +129,14 @@
     "glob": "^10.2.6",
     "glob-gitignore": "latest",
     "husky": "4.x",
-    "jest": "^29.5.0",
+    "jest": "^29.7.0",
     "jest-snapshot-serializer-raw": "^1.2.0",
     "js-yaml": "latest",
-    "json-schema-to-typescript": "^13.0.1",
+    "json-schema-to-typescript": "^13.0.2",
     "lint-staged": "latest",
     "lodash.camelcase": "^4.3.0",
     "lodash.set": "^4.3.2",
-    "node-fetch": "^3.3.1",
+    "node-fetch": "^3.3.2",
     "prettier": "^2.8.8",
     "typescript": "~5.1.3"
   },
@@ -143,6 +147,6 @@
     ]
   },
   "engines": {
-    "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+    "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
   }
 }