ts-jest 29.1.1 → 29.1.2

package/.ts-jest-digest

@@ -1 +1 @@
-b3b0008986ac15bb8a6bdd80c9102577ea718871
+fd7a2b389f3e20a065a96b71c5064b3e4ee76d33

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [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,7 +1,7 @@
 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;
@@ -9,15 +9,15 @@ export declare class TsJestTransformer implements SyncTransformer {
     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,8 +27,8 @@ export declare class TsJestTransformer implements SyncTransformer {
      *
      * @public
      */
-    getCacheKey(fileContent: string, filePath: string, transformOptions: TransformOptionsTsJest): string;
-    getCacheKeyAsync(sourceText: string, sourcePath: string, transformOptions: TransformOptionsTsJest): Promise<string>;
+    getCacheKey(fileContent: string, filePath: string, transformOptions: TsJestTransformOptions): string;
+    getCacheKeyAsync(sourceText: string, sourcePath: string, transformOptions: TsJestTransformOptions): Promise<string>;
     /**
      * Subclasses extends `TsJestTransformer` can call this method to get resolved module disk cache
      */

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

@@ -196,40 +196,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 +305,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,6 +313,8 @@ 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,

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.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -128,11 +128,11 @@
     "jest": "^29.5.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 +143,6 @@
     ]
   },
   "engines": {
-    "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+    "node": "^16.10.0 || ^18.0.0 || >=20.0.0"
   }
 }