ts-jest 29.0.2 → 29.0.3

package/.ts-jest-digest

@@ -1 +1 @@
-60d16d7ed3a05cdc98e1c7fc94b0fb03a86f0172
+7378fcb54a209ca78cc5680b6d7f7243b480d5bb

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [29.0.3](https://github.com/kulshekhar/ts-jest/compare/v29.0.2...v29.0.3) (2022-09-28)
+
+
+### Bug Fixes
+
+* merge config from `globals` with transformer config correctly ([#3842](https://github.com/kulshekhar/ts-jest/issues/3842)) ([9c9fd60](https://github.com/kulshekhar/ts-jest/commit/9c9fd6097aea36a6e8b06b0e8841df22896f9121)), closes [#3841](https://github.com/kulshekhar/ts-jest/issues/3841)
+* **presets:** allow merging transform config when using presets ([#3833](https://github.com/kulshekhar/ts-jest/issues/3833)) ([afc6a94](https://github.com/kulshekhar/ts-jest/commit/afc6a948b17c2dc22be51b1a9475a0f6ecbbc372))
+
+
+### Features
+
+* add `useESM` option to `pathsToModuleNameMapper` options ([#3792](https://github.com/kulshekhar/ts-jest/issues/3792)) ([eabe906](https://github.com/kulshekhar/ts-jest/commit/eabe906e1dd6b132a7b0d05ffc13172cd8a6b73b))
+
+
+
 ## [29.0.2](https://github.com/kulshekhar/ts-jest/compare/v29.0.1...v29.0.2) (2022-09-23)
 
 

package/dist/cli/config/init.js

@@ -133,19 +133,18 @@ var run = function (args /* , logger: Logger */) { return __awaiter(void 0, void
                 jestConfig.testEnvironment = 'node';
             transformerConfig = Object.entries((_d = jestConfig.transform) !== null && _d !== void 0 ? _d : {}).reduce(function (acc, _a) {
                 var _b, _c;
-                var _d = __read(_a, 2), fileRegex = _d[0], transformerName = _d[1];
-                if (transformerName === 'ts-jest') {
-                    if (tsconfig || shouldPostProcessWithBabel) {
-                        var tsJestConf = {};
-                        if (tsconfig)
-                            tsJestConf.tsconfig = tsconfig;
-                        if (shouldPostProcessWithBabel)
-                            tsJestConf.babelConfig = true;
-                        return __assign(__assign({}, acc), (_b = {}, _b[fileRegex] = [transformerName, tsJestConf], _b));
-                    }
-                    return __assign(__assign({}, acc), (_c = {}, _c[fileRegex] = transformerName, _c));
+                var _d = __read(_a, 2), fileRegex = _d[0], transformerConfig = _d[1];
+                if (tsconfig || shouldPostProcessWithBabel) {
+                    var tsJestConf = {};
+                    if (tsconfig)
+                        tsJestConf.tsconfig = tsconfig;
+                    if (shouldPostProcessWithBabel)
+                        tsJestConf.babelConfig = true;
+                    return __assign(__assign({}, acc), (_b = {}, _b[fileRegex] = typeof transformerConfig === 'string'
+                        ? [transformerConfig, tsJestConf]
+                        : [transformerConfig[0], __assign(__assign({}, transformerConfig[1]), tsJestConf)], _b));
                 }
-                return acc;
+                return __assign(__assign({}, acc), (_c = {}, _c[fileRegex] = transformerConfig, _c));
             }, {});
             if (Object.keys(transformerConfig).length) {
                 jestConfig.transform = __assign(__assign({}, jestConfig.transform), transformerConfig);

package/dist/cli/config/migrate.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -76,7 +87,7 @@ var presets_1 = require("../helpers/presets");
  * @internal
  */
 var run = function (args /* , logger: Logger*/) { return __awaiter(void 0, void 0, void 0, function () {
-    var nullLogger, file, filePath, footNotes, name, isPackage, actualConfig, migratedConfig, presetName, preset, jsTransformers, jsWithTs, jsWithBabel, presetValue, migratedValue, presetValue, migratedValue, globalsTsJestConfig, before, after, stringify, prefix;
+    var nullLogger, file, filePath, footNotes, name, isPackage, actualConfig, migratedConfig, presetName, preset, jsTransformers, jsWithTs, jsWithBabel, presetValue, migratedValue, presetValue, migratedValue, globalsTsJestConfig, migratedConfigTransform, presetValueTransform_1, before, after, stringify, prefix;
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     return __generator(this, function (_l) {
         nullLogger = (0, bs_logger_1.createLogger)({ targets: [] });
@@ -194,10 +205,32 @@ var run = function (args /* , logger: Logger*/) { return __awaiter(void 0, void
             delete ((_k = migratedConfig.globals) !== null && _k !== void 0 ? _k : Object.create(null))['ts-jest'];
         }
         // check if it's the same as the preset's one
-        if (preset &&
-            migratedConfig.transform &&
-            (0, fast_json_stable_stringify_1.default)(migratedConfig.transform) === (0, fast_json_stable_stringify_1.default)(preset.value.transform)) {
-            delete migratedConfig.transform;
+        if (preset && migratedConfig.transform) {
+            if ((0, fast_json_stable_stringify_1.default)(migratedConfig.transform) === (0, fast_json_stable_stringify_1.default)(preset.value.transform)) {
+                delete migratedConfig.transform;
+            }
+            else {
+                migratedConfigTransform = migratedConfig.transform;
+                presetValueTransform_1 = preset.value.transform;
+                if (migratedConfigTransform && presetValueTransform_1) {
+                    migratedConfig.transform = Object.entries(migratedConfigTransform).reduce(
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    function (acc, _a) {
+                        var _b, _c;
+                        var _d = __read(_a, 2), fileRegex = _d[0], transformerConfig = _d[1];
+                        var presetValueTransformerConfig = presetValueTransform_1[fileRegex];
+                        var shouldRemoveDuplicatedConfig = (presetValueTransformerConfig &&
+                            Array.isArray(presetValueTransformerConfig) &&
+                            transformerConfig === presetValueTransformerConfig[0] &&
+                            !Object.keys(presetValueTransformerConfig[1]).length) ||
+                            transformerConfig === presetValueTransformerConfig;
+                        return shouldRemoveDuplicatedConfig
+                            ? acc
+                            : acc
+                                ? __assign(__assign({}, acc), (_b = {}, _b[fileRegex] = transformerConfig, _b)) : (_c = {}, _c[fileRegex] = transformerConfig, _c);
+                    }, undefined);
+                }
+            }
         }
         // cleanup
         cleanupConfig(actualConfig);

package/dist/config/paths-to-module-name-mapper.d.ts

@@ -1,6 +1,7 @@
 import type { Config } from '@jest/types';
 declare type JestPathMapping = Config.InitialOptions['moduleNameMapper'];
-export declare const pathsToModuleNameMapper: (mapping: import("typescript").MapLike<string[]>, { prefix }?: {
-    prefix: string;
+export declare const pathsToModuleNameMapper: (mapping: import("typescript").MapLike<string[]>, { prefix, useESM }?: {
+    prefix?: string | undefined;
+    useESM?: boolean | undefined;
 }) => JestPathMapping;
 export {};

package/dist/config/paths-to-module-name-mapper.js

@@ -22,12 +22,11 @@ var escapeRegex = function (str) { return str.replace(/[-\\^$*+?.()|[\]{}]/g, '\
 var logger = utils_1.rootLogger.child((_a = {}, _a[bs_logger_1.LogContexts.namespace] = 'path-mapper', _a));
 var pathsToModuleNameMapper = function (mapping, _a) {
     var e_1, _b;
-    var _c = _a === void 0 ? Object.create(null) : _a, _d = _c.prefix, prefix = _d === void 0 ? '' : _d;
+    var _c = _a === void 0 ? {} : _a, _d = _c.prefix, prefix = _d === void 0 ? '' : _d, _e = _c.useESM, useESM = _e === void 0 ? false : _e;
     var jestMap = {};
     try {
-        for (var _e = __values(Object.keys(mapping)), _f = _e.next(); !_f.done; _f = _e.next()) {
-            var fromPath = _f.value;
-            var pattern = void 0;
+        for (var _f = __values(Object.keys(mapping)), _g = _f.next(); !_g.done; _g = _f.next()) {
+            var fromPath = _g.value;
             var toPaths = mapping[fromPath];
             // check that we have only one target path
             if (toPaths.length === 0) {
@@ -41,8 +40,8 @@ var pathsToModuleNameMapper = function (mapping, _a) {
                     var enrichedPrefix = prefix !== '' && !prefix.endsWith('/') ? "".concat(prefix, "/") : prefix;
                     return "".concat(enrichedPrefix).concat(target);
                 });
-                pattern = "^".concat(escapeRegex(fromPath), "$");
-                jestMap[pattern] = paths.length === 1 ? paths[0] : paths;
+                var cjsPattern = "^".concat(escapeRegex(fromPath), "$");
+                jestMap[cjsPattern] = paths.length === 1 ? paths[0] : paths;
             }
             else if (segments.length === 2) {
                 var paths = toPaths.map(function (target) {
@@ -50,8 +49,12 @@ var pathsToModuleNameMapper = function (mapping, _a) {
                     var enrichedPrefix = prefix !== '' && !prefix.endsWith('/') ? "".concat(prefix, "/") : prefix;
                     return "".concat(enrichedPrefix).concat(enrichedTarget.replace(/\*/g, '$1'));
                 });
-                pattern = "^".concat(escapeRegex(segments[0]), "(.*)").concat(escapeRegex(segments[1]), "$");
-                jestMap[pattern] = paths.length === 1 ? paths[0] : paths;
+                if (useESM) {
+                    var esmPattern = "^".concat(escapeRegex(segments[0]), "(.*)").concat(escapeRegex(segments[1]), "\\.js$");
+                    jestMap[esmPattern] = paths.length === 1 ? paths[0] : paths;
+                }
+                var cjsPattern = "^".concat(escapeRegex(segments[0]), "(.*)").concat(escapeRegex(segments[1]), "$");
+                jestMap[cjsPattern] = paths.length === 1 ? paths[0] : paths;
             }
             else {
                 logger.warn((0, messages_1.interpolate)("Not mapping \"{{path}}\" because it has more than one star (`*`)." /* Errors.NotMappingMultiStarPath */, { path: fromPath }));
@@ -61,10 +64,13 @@ var pathsToModuleNameMapper = function (mapping, _a) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+            if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
         }
         finally { if (e_1) throw e_1.error; }
     }
+    if (useESM) {
+        jestMap['^(\\.{1,2}/.*)\\.js$'] = '$1';
+    }
     return jestMap;
 };
 exports.pathsToModuleNameMapper = pathsToModuleNameMapper;

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

@@ -109,7 +109,7 @@ var TsJestTransformer = /** @class */ (function () {
         process.env.TS_JEST = '1';
     }
     TsJestTransformer.prototype._configsFor = function (transformOptions) {
-        var _a, _b;
+        var _a, _b, _c;
         var config = transformOptions.config, cacheFS = transformOptions.cacheFS;
         var ccs = TsJestTransformer._cachedConfigSets.find(function (cs) { return cs.jestConfig.value === config; });
         var configSet;
@@ -143,8 +143,10 @@ var TsJestTransformer = /** @class */ (function () {
                 if ((_a = config.globals) === null || _a === void 0 ? void 0 : _a['ts-jest']) {
                     this._logger.warn("Define `ts-jest` config under `globals` is deprecated. Please do\ntransform: {\n    <transform_regex>: ['ts-jest', { /* ts-jest config goes here in Jest */ }],\n}," /* Deprecations.GlobalsTsJestConfigOption */);
                 }
+                var jestGlobalsConfig = (_b = config.globals) !== null && _b !== void 0 ? _b : {};
+                var tsJestGlobalsConfig = (_c = jestGlobalsConfig['ts-jest']) !== null && _c !== void 0 ? _c : {};
                 var migratedConfig = this.tsJestConfig
-                    ? __assign(__assign({}, config), { globals: __assign(__assign({}, ((_b = config.globals) !== null && _b !== void 0 ? _b : Object.create(null))), { 'ts-jest': this.tsJestConfig }) }) : config;
+                    ? __assign(__assign({}, config), { globals: __assign(__assign({}, jestGlobalsConfig), { 'ts-jest': __assign(__assign({}, tsJestGlobalsConfig), this.tsJestConfig) }) }) : config;
                 configSet = this._createConfigSet(migratedConfig);
                 var jest_1 = __assign({}, migratedConfig);
                 // we need to remove some stuff from jest config

package/dist/presets/create-jest-preset.js

@@ -22,8 +22,9 @@ function createJestPreset(legacy, allowJs, extraOptions) {
     logger.debug({ allowJs: allowJs }, 'creating jest presets', allowJs ? 'handling' : 'not handling', 'JavaScript files');
     var extensionsToTreatAsEsm = extraOptions.extensionsToTreatAsEsm, moduleFileExtensions = extraOptions.moduleFileExtensions, testMatch = extraOptions.testMatch;
     var supportESM = extensionsToTreatAsEsm === null || extensionsToTreatAsEsm === void 0 ? void 0 : extensionsToTreatAsEsm.length;
+    var tsJestTransformOptions = supportESM ? { useESM: true } : {};
     return __assign(__assign(__assign(__assign({}, (extensionsToTreatAsEsm ? { extensionsToTreatAsEsm: extensionsToTreatAsEsm } : undefined)), (moduleFileExtensions ? { moduleFileExtensions: moduleFileExtensions } : undefined)), (testMatch ? { testMatch: testMatch } : undefined)), { transform: __assign(__assign({}, extraOptions.transform), (_a = {}, _a[allowJs ? (supportESM ? '^.+\\.m?[tj]sx?$' : '^.+\\.[tj]sx?$') : '^.+\\.tsx?$'] = legacy
-            ? 'ts-jest/legacy'
-            : 'ts-jest', _a)) });
+            ? ['ts-jest/legacy', tsJestTransformOptions]
+            : ['ts-jest', tsJestTransformOptions], _a)) });
 }
 exports.createJestPreset = createJestPreset;

package/dist/types.d.ts

@@ -20,7 +20,6 @@ export declare type TTypeScript = typeof _ts;
  * Don't mark as internal because it is used in TsJestGlobalOptions which is an exposed type
  */
 export declare type BabelConfig = _babel.TransformOptions;
-export declare type TsJestPresets = Pick<Config.InitialOptions, 'extensionsToTreatAsEsm' | 'moduleFileExtensions' | 'transform' | 'testMatch'>;
 export interface AstTransformer<T = Record<string, unknown>> {
     path: string;
     options?: T;
@@ -145,9 +144,10 @@ export interface InitialOptionsTsJest extends Config.InitialOptions {
 export declare type TsJestTransformerOptions = TsJestGlobalOptions;
 export interface JestConfigWithTsJest extends Omit<Config.InitialOptions, 'transform'> {
     transform?: {
-        [regex: string]: 'ts-jest' | ['ts-jest', TsJestTransformerOptions] | string | [string, Record<string, unknown>];
+        [regex: string]: 'ts-jest' | 'ts-jest/legacy' | ['ts-jest', TsJestTransformerOptions] | ['ts-jest/legacy', TsJestTransformerOptions] | string | Config.TransformerConfig;
     };
 }
+export declare type TsJestPresets = Pick<JestConfigWithTsJest, 'extensionsToTreatAsEsm' | 'moduleFileExtensions' | 'transform' | 'testMatch'>;
 export declare type StringMap = Map<string, string>;
 export interface DepGraphInfo {
     fileContent: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "29.0.2",
+  "version": "29.0.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -108,13 +108,13 @@
     "@types/semver": "latest",
     "@types/yargs": "latest",
     "@types/yargs-parser": "21.x",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@typescript-eslint/parser": "^5.38.1",
     "babel-jest": "^29.0.3",
     "conventional-changelog-cli": "2.x",
     "cross-spawn": "latest",
     "esbuild": "~0.15.9",
-    "eslint": "^8.23.1",
+    "eslint": "^8.24.0",
     "eslint-config-prettier": "latest",
     "eslint-plugin-import": "latest",
     "eslint-plugin-jest": "latest",