@nx/jest 16.8.0-beta.4 → 16.8.0-beta.6

package/src/migrations/update-12-1-2/update-ts-jest.js

@@ -1,19 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const path_1 = require("path");
 const update_config_1 = require("../../utils/config/update-config");
 function updateJestConfig(tree) {
     (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (options, project) => {
-        var _a;
         if (!options.jestConfig) {
             return;
         }
         const jestConfigPath = options.jestConfig;
         const config = require((0, path_1.join)(tree.root, jestConfigPath));
-        const tsJestConfig = (_a = config.globals) === null || _a === void 0 ? void 0 : _a['ts-jest'];
+        const tsJestConfig = config.globals?.['ts-jest'];
         if (!(tsJestConfig && tsJestConfig.tsConfig)) {
             return;
         }
@@ -21,15 +19,13 @@ function updateJestConfig(tree) {
             (0, update_config_1.removePropertyFromJestConfig)(tree, jestConfigPath, 'globals.ts-jest.tsConfig');
             (0, update_config_1.addPropertyToJestConfig)(tree, jestConfigPath, 'globals.ts-jest.tsconfig', tsJestConfig.tsConfig);
         }
-        catch (_b) {
+        catch {
             devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update jest.config.js for project ${project}.`);
         }
     });
 }
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        updateJestConfig(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    updateJestConfig(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-12-4-0/add-test-environment-for-node.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const path_1 = require("path");
@@ -20,18 +19,16 @@ function updateJestConfig(tree) {
         try {
             (0, update_config_1.addPropertyToJestConfig)(tree, jestConfigPath, 'testEnvironment', 'node');
         }
-        catch (_a) {
+        catch {
             devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update jest.config.js for project ${project}.`);
         }
     });
 }
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        updateJestConfig(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    updateJestConfig(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;
 function checkIfNodeProject(config) {
-    return Object.entries(config.targets).some(([targetName, targetConfig]) => { var _a, _b; return (_b = (_a = targetConfig.executor) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, 'node'); });
+    return Object.entries(config.targets).some(([targetName, targetConfig]) => targetConfig.executor?.includes?.('node'));
 }

package/src/migrations/update-12-4-0/update-jest-preset-angular.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.usesJestPresetAngular = exports.transformerIsFromJestPresetAngular = exports.getNewAstTransformers = exports.updateTransform = exports.updateASTTransformers = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const path_1 = require("path");
@@ -20,21 +19,18 @@ function updateJestConfig(tree) {
             updateASTTransformers(tree, jestConfigPath, jestConfig);
             updateTransform(tree, jestConfigPath, jestConfig);
         }
-        catch (_a) {
+        catch {
             devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update jest.config.js for project ${project}.`);
         }
     });
 }
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        updateJestConfig(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    updateJestConfig(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;
 function updateASTTransformers(tree, jestConfigPath, jestConfig) {
-    var _a, _b;
-    const newTransformers = getNewAstTransformers((_b = (_a = jestConfig.globals) === null || _a === void 0 ? void 0 : _a['ts-jest']) === null || _b === void 0 ? void 0 : _b.astTransformers);
+    const newTransformers = getNewAstTransformers(jestConfig.globals?.['ts-jest']?.astTransformers);
     if (newTransformers === null) {
         (0, update_config_1.removePropertyFromJestConfig)(tree, jestConfigPath, 'globals.ts-jest.astTransformers');
     }
@@ -51,16 +47,15 @@ function updateTransform(tree, jestConfigPath, jestConfig) {
 }
 exports.updateTransform = updateTransform;
 function getNewAstTransformers(astTransformers) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     let result = {
-        before: (_b = (_a = astTransformers === null || astTransformers === void 0 ? void 0 : astTransformers.before) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.call(_a, (x) => !transformerIsFromJestPresetAngular(x)),
-        after: (_d = (_c = astTransformers === null || astTransformers === void 0 ? void 0 : astTransformers.after) === null || _c === void 0 ? void 0 : _c.filter) === null || _d === void 0 ? void 0 : _d.call(_c, (x) => !transformerIsFromJestPresetAngular(x)),
-        afterDeclarations: (_f = (_e = astTransformers === null || astTransformers === void 0 ? void 0 : astTransformers.afterDeclarations) === null || _e === void 0 ? void 0 : _e.filter) === null || _f === void 0 ? void 0 : _f.call(_e, (x) => !transformerIsFromJestPresetAngular(x)),
+        before: astTransformers?.before?.filter?.((x) => !transformerIsFromJestPresetAngular(x)),
+        after: astTransformers?.after?.filter?.((x) => !transformerIsFromJestPresetAngular(x)),
+        afterDeclarations: astTransformers?.afterDeclarations?.filter?.((x) => !transformerIsFromJestPresetAngular(x)),
     };
     result = {
-        before: ((_g = result.before) === null || _g === void 0 ? void 0 : _g.length) > 0 ? result.before : undefined,
-        after: ((_h = result.after) === null || _h === void 0 ? void 0 : _h.length) > 0 ? result.after : undefined,
-        afterDeclarations: ((_j = result.afterDeclarations) === null || _j === void 0 ? void 0 : _j.length) > 0
+        before: result.before?.length > 0 ? result.before : undefined,
+        after: result.after?.length > 0 ? result.after : undefined,
+        afterDeclarations: result.afterDeclarations?.length > 0
             ? result.afterDeclarations
             : undefined,
     };
@@ -79,10 +74,9 @@ function transformerIsFromJestPresetAngular(transformer) {
 }
 exports.transformerIsFromJestPresetAngular = transformerIsFromJestPresetAngular;
 function usesJestPresetAngular(jestConfig) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const transformers = Array.isArray((_b = (_a = jestConfig.globals) === null || _a === void 0 ? void 0 : _a['ts-jest']) === null || _b === void 0 ? void 0 : _b.astTransformers)
-        ? ((_d = (_c = jestConfig.globals) === null || _c === void 0 ? void 0 : _c['ts-jest']) === null || _d === void 0 ? void 0 : _d.astTransformers) || []
-        : ((_g = (_f = (_e = jestConfig.globals) === null || _e === void 0 ? void 0 : _e['ts-jest']) === null || _f === void 0 ? void 0 : _f.astTransformers) === null || _g === void 0 ? void 0 : _g.before) || [];
+    const transformers = Array.isArray(jestConfig.globals?.['ts-jest']?.astTransformers)
+        ? jestConfig.globals?.['ts-jest']?.astTransformers || []
+        : jestConfig.globals?.['ts-jest']?.astTransformers?.before || [];
     return transformers.some((x) => transformerIsFromJestPresetAngular(x));
 }
 exports.usesJestPresetAngular = usesJestPresetAngular;

package/src/migrations/update-12-6-0/update-base-jest-config.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const functions_1 = require("../../utils/config/functions");
 const get_jest_projects_1 = require("../../utils/config/get-jest-projects");
@@ -21,22 +20,19 @@ function determineProjectsValue(uncoveredJestProjects) {
         .join('')}]`;
 }
 function updateBaseJestConfig(tree, baseJestConfigPath = 'jest.config.js') {
-    var _a;
     if (tree.read('/jest.config.js', 'utf-8').includes('getJestProjects()')) {
         return;
     }
     const currentConfig = (0, functions_1.jestConfigObject)(tree, baseJestConfigPath);
-    (_a = currentConfig.projects) !== null && _a !== void 0 ? _a : (currentConfig.projects = []);
+    currentConfig.projects ??= [];
     const uncoveredJestProjects = determineUncoveredJestProjects(currentConfig.projects);
     (0, update_config_1.removePropertyFromJestConfig)(tree, baseJestConfigPath, 'projects');
     (0, update_config_1.addPropertyToJestConfig)(tree, baseJestConfigPath, 'projects', determineProjectsValue(uncoveredJestProjects), { valueAsString: true });
     (0, update_config_1.addImportStatementToJestConfig)(tree, baseJestConfigPath, `const { getJestProjects } = require('@nx/jest');`);
     return;
 }
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        updateBaseJestConfig(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    updateBaseJestConfig(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-13-1-2/update-tsconfigs-for-tests.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const path_1 = require("path");
@@ -50,10 +49,8 @@ function makeAllPatternsFromSpecPatterns(specGlobs = ['**/*.spec.ts']) {
 function makeUniquePatterns(items = []) {
     return [...new Set(items)];
 }
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        updateTsConfigsForTests(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function update(tree) {
+    updateTsConfigsForTests(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-13-4-4/add-missing-root-babel-config.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const functions_1 = require("../../utils/config/functions");
@@ -29,14 +28,12 @@ function checkIfProjectNeedsUpdate(tree) {
     });
     return shouldUpdate;
 }
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const shouldUpdateConfigs = checkIfProjectNeedsUpdate(tree);
-        if (shouldUpdateConfigs) {
-            (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/web': versions_1.nxVersion });
-            tree.write('babel.config.json', '{"babelrcRoots": ["*"]}');
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-    });
+async function update(tree) {
+    const shouldUpdateConfigs = checkIfProjectNeedsUpdate(tree);
+    if (shouldUpdateConfigs) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/web': versions_1.nxVersion });
+        tree.write('babel.config.json', '{"babelrcRoots": ["*"]}');
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = update;

package/src/migrations/update-14-0-0/update-jest-config-ext.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestConfigExt = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const path_1 = require("path");
@@ -52,63 +51,60 @@ function updateTsconfigSpec(tree, projectConfig, path, options = {
     });
 }
 function isNextWithProjectLint(projectConfig, esLintJson) {
-    var _a, _b, _c, _d;
-    const esLintOverrides = (_a = esLintJson === null || esLintJson === void 0 ? void 0 : esLintJson.overrides) === null || _a === void 0 ? void 0 : _a.find((o) => ['*.ts', '*.tsx', '*.js', '*.jsx'].every((ext) => o.files.includes(ext)));
+    const esLintOverrides = esLintJson?.overrides?.find((o) => ['*.ts', '*.tsx', '*.js', '*.jsx'].every((ext) => o.files.includes(ext)));
     // check if it's a next app and has a parserOptions.project set in the eslint overrides
-    return !!(((_c = (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _b === void 0 ? void 0 : _b['build']) === null || _c === void 0 ? void 0 : _c.executor) === '@nrwl/next:build' &&
-        ((_d = esLintOverrides === null || esLintOverrides === void 0 ? void 0 : esLintOverrides.parserOptions) === null || _d === void 0 ? void 0 : _d.project));
+    return !!(projectConfig?.targets?.['build']?.executor === '@nrwl/next:build' &&
+        esLintOverrides?.parserOptions?.project);
 }
-function updateJestConfigExt(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (tree.exists('jest.config.js')) {
-            tree.rename('jest.config.js', 'jest.config.ts');
+async function updateJestConfigExt(tree) {
+    if (tree.exists('jest.config.js')) {
+        tree.rename('jest.config.js', 'jest.config.ts');
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (options, projectName, target, configuration) => {
+        const projectConfig = projects.get(projectName);
+        if (!options.jestConfig || !isJestConfigValid(tree, options)) {
+            return;
         }
-        const projects = (0, devkit_1.getProjects)(tree);
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/jest:jest', (options, projectName, target, configuration) => {
-            const projectConfig = projects.get(projectName);
-            if (!options.jestConfig || !isJestConfigValid(tree, options)) {
-                return;
-            }
-            addEsLintIgnoreComments(tree, options.jestConfig);
-            const newJestConfigPath = options.jestConfig.replace('.js', '.ts');
-            tree.rename(options.jestConfig, newJestConfigPath);
-            const rootFiles = tree.children(projectConfig.root);
-            for (const fileName of rootFiles) {
-                if (fileName === 'tsconfig.json') {
-                    const filePath = (0, devkit_1.joinPathFragments)(projectConfig.root, fileName);
-                    const tsConfig = (0, devkit_1.readJson)(tree, filePath, {
-                        allowTrailingComma: true,
-                        disallowComments: false,
-                    });
-                    if (tsConfig.references) {
-                        for (const { path } of tsConfig.references) {
-                            // skip as editor.json should include everything anyway.
-                            if (path.endsWith('tsconfig.editor.json')) {
-                                continue;
-                            }
-                            if (path.endsWith('tsconfig.spec.json')) {
-                                const eslintPath = (0, devkit_1.joinPathFragments)(projectConfig.root, '.eslintrc.json');
-                                updateTsconfigSpec(tree, projectConfig, path, {
-                                    isNextWithProjectParse: tree.exists(eslintPath)
-                                        ? isNextWithProjectLint(projectConfig, (0, devkit_1.readJson)(tree, eslintPath))
-                                        : false,
-                                    tsConfigPath: filePath,
-                                });
-                                continue;
-                            }
-                            updateTsConfig(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, path));
+        addEsLintIgnoreComments(tree, options.jestConfig);
+        const newJestConfigPath = options.jestConfig.replace('.js', '.ts');
+        tree.rename(options.jestConfig, newJestConfigPath);
+        const rootFiles = tree.children(projectConfig.root);
+        for (const fileName of rootFiles) {
+            if (fileName === 'tsconfig.json') {
+                const filePath = (0, devkit_1.joinPathFragments)(projectConfig.root, fileName);
+                const tsConfig = (0, devkit_1.readJson)(tree, filePath, {
+                    allowTrailingComma: true,
+                    disallowComments: false,
+                });
+                if (tsConfig.references) {
+                    for (const { path } of tsConfig.references) {
+                        // skip as editor.json should include everything anyway.
+                        if (path.endsWith('tsconfig.editor.json')) {
+                            continue;
                         }
-                    }
-                    else {
-                        updateTsConfig(tree, filePath);
+                        if (path.endsWith('tsconfig.spec.json')) {
+                            const eslintPath = (0, devkit_1.joinPathFragments)(projectConfig.root, '.eslintrc.json');
+                            updateTsconfigSpec(tree, projectConfig, path, {
+                                isNextWithProjectParse: tree.exists(eslintPath)
+                                    ? isNextWithProjectLint(projectConfig, (0, devkit_1.readJson)(tree, eslintPath))
+                                    : false,
+                                tsConfigPath: filePath,
+                            });
+                            continue;
+                        }
+                        updateTsConfig(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, path));
                     }
                 }
+                else {
+                    updateTsConfig(tree, filePath);
+                }
             }
-            projectConfig.targets[target].options.jestConfig = newJestConfigPath;
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+        }
+        projectConfig.targets[target].options.jestConfig = newJestConfigPath;
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.updateJestConfigExt = updateJestConfigExt;
 exports.default = updateJestConfigExt;

package/src/migrations/update-14-6-0/update-configs-jest-28.js

@@ -16,7 +16,7 @@ function updateConfigsJest28(tree) {
             const updatedConfig = updateJestConfig(tree.read(options.jestConfig, 'utf-8'));
             tree.write(options.jestConfig, updatedConfig);
             const projectConfigCheck = testFileForDep(updatedConfig);
-            devDeps = Object.assign(Object.assign({}, devDeps), projectConfigCheck);
+            devDeps = { ...devDeps, ...projectConfigCheck };
         }
     });
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDeps);
@@ -24,8 +24,7 @@ function updateConfigsJest28(tree) {
 exports.updateConfigsJest28 = updateConfigsJest28;
 function updateJestConfig(config) {
     let content = tsquery_1.tsquery.replace(config, 'PropertyAssignment:has(Identifier[name="testURL"])', (node) => {
-        var _a;
-        const value = (_a = node === null || node === void 0 ? void 0 : node.initializer) === null || _a === void 0 ? void 0 : _a.getText();
+        const value = node?.initializer?.getText();
         return `testEnvironmentOptions: {url: ${value}}`;
     });
     content = tsquery_1.tsquery.replace(content, 'PropertyAssignment > Identifier[name="extraGlobals"]', () => {
@@ -33,8 +32,8 @@ function updateJestConfig(config) {
     });
     return tsquery_1.tsquery.replace(content, 'PropertyAssignment:has(Identifier[name="timers"])', (node) => {
         // must guard against non string properties as that means it's already been manually migrated
-        if ((node === null || node === void 0 ? void 0 : node.initializer) && (0, typescript_1.isStringLiteralLike)(node.initializer)) {
-            const value = node === null || node === void 0 ? void 0 : node.initializer.getText().trim();
+        if (node?.initializer && (0, typescript_1.isStringLiteralLike)(node.initializer)) {
+            const value = node?.initializer.getText().trim();
             // use .includes to ignore the different quotes (' " `)
             if (value.includes('fake') || value.includes('modern')) {
                 return `fakeTimers: { enableGlobally: true }`;
@@ -58,12 +57,12 @@ function checkDeps(tree) {
     const rootJestConfig = (0, find_root_jest_files_1.findRootJestConfig)(tree);
     if (rootJestConfig) {
         const rootConfigCheck = testFileForDep(tree.read(rootJestConfig, 'utf-8'));
-        devDeps = Object.assign(Object.assign({}, devDeps), rootConfigCheck);
+        devDeps = { ...devDeps, ...rootConfigCheck };
     }
     const rootJestPreset = (0, find_root_jest_files_1.findRootJestPreset)(tree);
     if (rootJestPreset) {
         const rootPresetCheck = testFileForDep(tree.read(rootJestPreset, 'utf-8'));
-        devDeps = Object.assign(Object.assign({}, devDeps), rootPresetCheck);
+        devDeps = { ...devDeps, ...rootPresetCheck };
     }
     return devDeps;
 }

package/src/migrations/update-14-6-0/update-tests-jest-28.js

@@ -36,7 +36,7 @@ exports.updateTestsJest28 = updateTestsJest28;
  */
 function updateJestTimers(fileContents, legacyFakeTimersInConfig) {
     return tsquery_1.tsquery.replace(fileContents, 'CallExpression', (node) => {
-        if (!(node === null || node === void 0 ? void 0 : node.getText().startsWith('jest.useFakeTimers'))) {
+        if (!node?.getText().startsWith('jest.useFakeTimers')) {
             return;
         }
         const timerType = node.getText();
@@ -68,10 +68,9 @@ function isTypedJestFnMock(node) {
  * jest.fn<number, [string, number, SomeType]>()
  */
 function isValid2Args(node) {
-    var _a, _b;
-    const r = (node === null || node === void 0 ? void 0 : node.typeArguments.length) === 2 &&
-        (((_a = node.typeArguments[1]) === null || _a === void 0 ? void 0 : _a.kind) === ts.SyntaxKind.TupleType ||
-            ((_b = node.typeArguments[1]) === null || _b === void 0 ? void 0 : _b.kind) === ts.SyntaxKind.ArrayType);
+    const r = node?.typeArguments.length === 2 &&
+        (node.typeArguments[1]?.kind === ts.SyntaxKind.TupleType ||
+            node.typeArguments[1]?.kind === ts.SyntaxKind.ArrayType);
     return r;
 }
 /**
@@ -82,10 +81,9 @@ function isValid2Args(node) {
  * jest.fn<() => Promise<string>>() is already valid, don't change it.
  */
 function isValid1Arg(node) {
-    var _a, _b;
-    const r = (node === null || node === void 0 ? void 0 : node.typeArguments.length) === 1 &&
-        ((_a = node.typeArguments[0]) === null || _a === void 0 ? void 0 : _a.kind) !== ts.SyntaxKind.FunctionType &&
-        ((_b = node.typeArguments[0]) === null || _b === void 0 ? void 0 : _b.kind) !== ts.SyntaxKind.TypeQuery;
+    const r = node?.typeArguments.length === 1 &&
+        node.typeArguments[0]?.kind !== ts.SyntaxKind.FunctionType &&
+        node.typeArguments[0]?.kind !== ts.SyntaxKind.TypeQuery;
     return r;
 }
 /**
@@ -93,20 +91,18 @@ function isValid1Arg(node) {
  * jest.fn<ReturnType<typeof add>, Parameters<typeof add>>();
  */
 function isValidTypeRef(node) {
-    var _a, _b;
     const r = node.typeArguments[0].kind === ts.SyntaxKind.TypeReference &&
-        !!((_b = (_a = node.typeArguments) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.typeArguments);
+        !!node.typeArguments?.[0]?.typeArguments;
     return r;
 }
 /**
  * has valid type args. prevent converting an already converted jest.fn<T>()
  */
 function isValidType(node) {
-    var _a, _b, _c;
-    const r = (node === null || node === void 0 ? void 0 : node.typeArguments.length) === 1 &&
-        (((_a = node.typeArguments[0]) === null || _a === void 0 ? void 0 : _a.kind) === ts.SyntaxKind.FunctionType ||
-            ((_b = node.typeArguments[0]) === null || _b === void 0 ? void 0 : _b.kind) === ts.SyntaxKind.TypeReference ||
-            ((_c = node.typeArguments[0]) === null || _c === void 0 ? void 0 : _c.kind) === ts.SyntaxKind.TypeQuery ||
+    const r = node?.typeArguments.length === 1 &&
+        (node.typeArguments[0]?.kind === ts.SyntaxKind.FunctionType ||
+            node.typeArguments[0]?.kind === ts.SyntaxKind.TypeReference ||
+            node.typeArguments[0]?.kind === ts.SyntaxKind.TypeQuery ||
             node.parent.getText().includes('/** TODO:')); // has already been marked by a previous run.
     return r;
 }

package/src/migrations/update-15-0-0/add-jest-inputs.js

@@ -1,40 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function default_1(tree) {
-    var _a, _b, _c, _d;
-    var _e;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        const jestTargets = getJestTargetNames(tree);
-        const hasProductionFileset = !!((_a = nxJson.namedInputs) === null || _a === void 0 ? void 0 : _a.production);
-        if (jestTargets.size > 0 && hasProductionFileset) {
-            const productionFileset = new Set(nxJson.namedInputs.production);
-            for (const exclusion of [
-                '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',
-                '!{projectRoot}/tsconfig.spec.json',
-                '!{projectRoot}/jest.config.[jt]s',
-            ]) {
-                productionFileset.add(exclusion);
-            }
-            nxJson.namedInputs.production = Array.from(productionFileset);
+async function default_1(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const jestTargets = getJestTargetNames(tree);
+    const hasProductionFileset = !!nxJson.namedInputs?.production;
+    if (jestTargets.size > 0 && hasProductionFileset) {
+        const productionFileset = new Set(nxJson.namedInputs.production);
+        for (const exclusion of [
+            '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',
+            '!{projectRoot}/tsconfig.spec.json',
+            '!{projectRoot}/jest.config.[jt]s',
+        ]) {
+            productionFileset.add(exclusion);
         }
-        for (const targetName of jestTargets) {
-            (_b = nxJson.targetDefaults) !== null && _b !== void 0 ? _b : (nxJson.targetDefaults = {});
-            const jestTargetDefaults = ((_c = (_e = nxJson.targetDefaults)[targetName]) !== null && _c !== void 0 ? _c : (_e[targetName] = {}));
-            (_d = jestTargetDefaults.inputs) !== null && _d !== void 0 ? _d : (jestTargetDefaults.inputs = [
-                'default',
-                hasProductionFileset ? '^production' : '^default',
-                ...(tree.exists('jest.preset.js')
-                    ? ['{workspaceRoot}/jest.preset.js']
-                    : []),
-            ]);
-        }
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+        nxJson.namedInputs.production = Array.from(productionFileset);
+    }
+    for (const targetName of jestTargets) {
+        nxJson.targetDefaults ??= {};
+        const jestTargetDefaults = (nxJson.targetDefaults[targetName] ??= {});
+        jestTargetDefaults.inputs ??= [
+            'default',
+            hasProductionFileset ? '^production' : '^default',
+            ...(tree.exists('jest.preset.js')
+                ? ['{workspaceRoot}/jest.preset.js']
+                : []),
+        ];
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;
 function getJestTargetNames(tree) {