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

package/src/migrations/update-15-8-0/update-configs-jest-29.js

@@ -1,45 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateConfigsJest29 = 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 ast_utils_1 = require("../../utils/ast-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = require("typescript");
 const find_root_jest_files_1 = require("../../utils/config/find-root-jest-files");
-function updateConfigsJest29(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const rootPreset = (0, find_root_jest_files_1.findRootJestPreset)(tree);
-        const targetsWithJest = new Set();
-        // have to use graph so the negative configuration targets are expanded
-        const graph = yield (0, devkit_1.createProjectGraphAsync)();
-        (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/jest:jest', (options, projectName, targetName) => {
-            if (options.jestConfig && tree.exists(options.jestConfig)) {
-                targetsWithJest.add(targetName);
-                // if the default root preset exists or if the project doesn't have a 'preset' configured
-                //  -> update snapshot config
-                if (!rootPreset || !hasPresetConfigured(tree, options.jestConfig)) {
-                    addSnapshotOptionsToConfig(tree, options.jestConfig, `From within the project directory, run "nx test --update-snapshot"`);
-                }
-                updateTsJestOptions(tree, options.jestConfig);
-                updateNgJestOptions(tree, options.jestConfig);
+async function updateConfigsJest29(tree) {
+    const rootPreset = (0, find_root_jest_files_1.findRootJestPreset)(tree);
+    const targetsWithJest = new Set();
+    // have to use graph so the negative configuration targets are expanded
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/jest:jest', (options, projectName, targetName) => {
+        if (options.jestConfig && tree.exists(options.jestConfig)) {
+            targetsWithJest.add(targetName);
+            // if the default root preset exists or if the project doesn't have a 'preset' configured
+            //  -> update snapshot config
+            if (!rootPreset || !hasPresetConfigured(tree, options.jestConfig)) {
+                addSnapshotOptionsToConfig(tree, options.jestConfig, `From within the project directory, run "nx test --update-snapshot"`);
             }
-        });
-        if (rootPreset && tree.exists(rootPreset)) {
-            const cmd = `"nx affected --targets=${Array.from(targetsWithJest).join(',')} --update-snapshot"`;
-            addSnapshotOptionsToConfig(tree, rootPreset, cmd);
-            updateTsJestOptions(tree, rootPreset);
-            updateNgJestOptions(tree, rootPreset);
+            updateTsJestOptions(tree, options.jestConfig);
+            updateNgJestOptions(tree, options.jestConfig);
         }
-        yield (0, devkit_1.formatFiles)(tree);
-        devkit_1.logger.info((0, devkit_1.stripIndents) `NX Jest Snapshot format changed in v29.
+    });
+    if (rootPreset && tree.exists(rootPreset)) {
+        const cmd = `"nx affected --targets=${Array.from(targetsWithJest).join(',')} --update-snapshot"`;
+        addSnapshotOptionsToConfig(tree, rootPreset, cmd);
+        updateTsJestOptions(tree, rootPreset);
+        updateNgJestOptions(tree, rootPreset);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+    devkit_1.logger.info((0, devkit_1.stripIndents) `NX Jest Snapshot format changed in v29.
 By default Nx kept the older style to prevent breaking of existing tests with snapshots.
 It's recommend you update to the latest format.
 You can do this in your project's jest config file.
 Remove the snapshotFormat property and re-run tests with the --update-snapshot flag.
 More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format`);
-    });
 }
 exports.updateConfigsJest29 = updateConfigsJest29;
 function addSnapshotOptionsToConfig(tree, configPath, updateSnapshotExample) {
@@ -66,9 +63,8 @@ snapshotFormat: { escapeString: true, printBasicPrototype: true }
     tree.write(configPath, updatedConfig);
 }
 function hasPresetConfigured(tree, configPath) {
-    var _a;
     const contents = tree.read(configPath, 'utf-8');
-    return (((_a = tsquery_1.tsquery.query(contents, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="preset"])`)) === null || _a === void 0 ? void 0 : _a.length) > 0);
+    return (tsquery_1.tsquery.query(contents, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="preset"])`)?.length > 0);
 }
 function updateTsJestOptions(tree, configPath) {
     // query for the globals property, if they don't have one then there's nothing to modify.
@@ -125,15 +121,13 @@ testEnvironmentOptions: { teardown: ${ngJestTeardownConfig} },
     tree.write(configPath, updatedConfig);
 }
 function getGlobalTsJestConfig(node) {
-    var _a;
     const globalObject = node.initializer;
     const foundConfig = globalObject.properties.find((p) => ts.isPropertyAssignment(p) && p.name.getText().includes('ts-jest'));
-    return ((_a = foundConfig === null || foundConfig === void 0 ? void 0 : foundConfig.initializer) === null || _a === void 0 ? void 0 : _a.getText()) || '';
+    return foundConfig?.initializer?.getText() || '';
 }
 function getGlobalConfigWithoutTsJest(node) {
-    var _a;
-    const globalObject = node === null || node === void 0 ? void 0 : node.initializer;
-    const withoutTsJest = (_a = globalObject === null || globalObject === void 0 ? void 0 : globalObject.properties) === null || _a === void 0 ? void 0 : _a.filter((p) => {
+    const globalObject = node?.initializer;
+    const withoutTsJest = globalObject?.properties?.filter((p) => {
         return !(ts.isPropertyAssignment(p) && p.name.getText().includes('ts-jest'));
     });
     const globalConfigs = withoutTsJest.map((c) => c.getText()).join(',\n');
@@ -141,7 +135,7 @@ function getGlobalConfigWithoutTsJest(node) {
 }
 function getNodeWithComments(fullText, node) {
     const commentRanges = ts.getLeadingCommentRanges(fullText, node.getFullStart());
-    if ((commentRanges === null || commentRanges === void 0 ? void 0 : commentRanges.length) > 0) {
+    if (commentRanges?.length > 0) {
         const withComments = `${commentRanges
             .map((r) => fullText.slice(r.pos, r.end))
             .join('\n')}\n${node.getText()}`;

package/src/migrations/update-15-8-0/update-tests-jest-29.js

@@ -1,26 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestMocked = exports.updateJestMockTypes = exports.updateTestsJest29 = 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 tsquery_1 = require("@phenomnomnominal/tsquery");
 const ast_utils_1 = require("../../utils/ast-utils");
-function updateTestsJest29(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const graph = yield (0, devkit_1.createProjectGraphAsync)();
-        (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/jest:jest', (options, projectName) => {
-            const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot || projectConfig.root, (file) => {
-                if (!ast_utils_1.TEST_FILE_PATTERN.test(file)) {
-                    return;
-                }
-                updateJestMockTypes(tree, file);
-                updateJestMocked(tree, file);
-            });
+async function updateTestsJest29(tree) {
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/jest:jest', (options, projectName) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot || projectConfig.root, (file) => {
+            if (!ast_utils_1.TEST_FILE_PATTERN.test(file)) {
+                return;
+            }
+            updateJestMockTypes(tree, file);
+            updateJestMocked(tree, file);
         });
-        yield (0, devkit_1.formatFiles)(tree);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.updateTestsJest29 = updateTestsJest29;
 function updateJestMockTypes(tree, filePath) {

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/jest', '@nx/jest');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/jest', '@nx/jest');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/migrations/update-16-5-0/add-test-setup-to-inputs-ignore.js

@@ -1,22 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addTestSetupToIgnoredInputs = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function addTestSetupToIgnoredInputs(tree) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        if (!nxJson) {
-            return;
-        }
-        if (((_a = nxJson.namedInputs) === null || _a === void 0 ? void 0 : _a.production) &&
-            !nxJson.namedInputs.production.includes('!{projectRoot}/src/test-setup.[jt]s')) {
-            nxJson.namedInputs.production.push('!{projectRoot}/src/test-setup.[jt]s');
-            (0, devkit_1.updateNxJson)(tree, nxJson);
-        }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function addTestSetupToIgnoredInputs(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson) {
+        return;
+    }
+    if (nxJson.namedInputs?.production &&
+        !nxJson.namedInputs.production.includes('!{projectRoot}/src/test-setup.[jt]s')) {
+        nxJson.namedInputs.production.push('!{projectRoot}/src/test-setup.[jt]s');
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.addTestSetupToIgnoredInputs = addTestSetupToIgnoredInputs;
 exports.default = addTestSetupToIgnoredInputs;

package/src/utils/config/functions.js

@@ -125,23 +125,21 @@ function removeProperty(object, properties) {
 }
 exports.removeProperty = removeProperty;
 function isModuleExport(node) {
-    var _a, _b;
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     return (tsModule.isExpressionStatement(node) &&
-        ((_a = node.expression) === null || _a === void 0 ? void 0 : _a.kind) &&
+        node.expression?.kind &&
         tsModule.isBinaryExpression(node.expression) &&
         node.expression.left.getText() === 'module.exports' &&
-        ((_b = node.expression.operatorToken) === null || _b === void 0 ? void 0 : _b.kind) === tsModule.SyntaxKind.EqualsToken);
+        node.expression.operatorToken?.kind === tsModule.SyntaxKind.EqualsToken);
 }
 function isDefaultExport(node) {
-    var _a;
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     return (tsModule.isExportAssignment(node) &&
-        ((_a = node.expression) === null || _a === void 0 ? void 0 : _a.kind) &&
+        node.expression?.kind &&
         tsModule.isObjectLiteralExpression(node.expression) &&
         node.getText().startsWith('export default'));
 }

package/src/utils/config/get-jest-projects.js

@@ -19,7 +19,6 @@ function getJestConfigProjectPath(projectJestConfigPath) {
  *
  **/
 function getJestProjects() {
-    var _a;
     const ws = (0, file_utils_1.readWorkspaceConfig)({
         format: 'nx',
     });
@@ -33,7 +32,7 @@ function getJestProjects() {
                 targetConfiguration.executor !== '@nrwl/jest:jest') {
                 continue;
             }
-            if ((_a = targetConfiguration.options) === null || _a === void 0 ? void 0 : _a.jestConfig) {
+            if (targetConfiguration.options?.jestConfig) {
                 jestConfigurationSet.add(getJestConfigProjectPath(targetConfiguration.options.jestConfig));
             }
             if (targetConfiguration.configurations) {