@nx/eslint-plugin 16.8.0-beta.4 → 16.8.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.6",
   "private": false,
   "description": "The eslint-plugin package is an ESLint plugin that contains a collection of recommended ESLint rule configurations which you can extend from in your own ESLint configs, as well as an Nx-specific lint rule called enforce-module-boundaries.",
   "repository": {
@@ -33,9 +33,9 @@
     }
   },
   "dependencies": {
-    "@nrwl/eslint-plugin-nx": "16.8.0-beta.4",
-    "@nx/devkit": "16.8.0-beta.4",
-    "@nx/js": "16.8.0-beta.4",
+    "@nrwl/eslint-plugin-nx": "16.8.0-beta.6",
+    "@nx/devkit": "16.8.0-beta.6",
+    "@nx/js": "16.8.0-beta.6",
     "@typescript-eslint/type-utils": "^5.60.1",
     "@typescript-eslint/utils": "^5.60.1",
     "chalk": "^4.1.0",
@@ -51,5 +51,5 @@
     "migrations": "./migrations.json"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "0cc6ba996f2ef09f00b932c8eacf42de642457f3"
 }

package/src/configs/angular.js

@@ -1,11 +1,10 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 let angularEslintPlugin;
 try {
     angularEslintPlugin = require('@angular-eslint/eslint-plugin');
 }
-catch (_b) { }
+catch { }
 /**
  * This configuration is intended to be applied to ALL .ts files in Angular
  * projects within an Nx workspace.
@@ -30,7 +29,7 @@ exports.default = {
          * TODO: Consider dropping this extends and explicitly carrying over rules we care about
          * into our typescript preset in v13
          */
-        ...(((_a = angularEslintPlugin === null || angularEslintPlugin === void 0 ? void 0 : angularEslintPlugin.configs) === null || _a === void 0 ? void 0 : _a['recommended--extra'])
+        ...(angularEslintPlugin?.configs?.['recommended--extra']
             ? ['plugin:@angular-eslint/recommended--extra']
             : []),
     ],

package/src/index.js

@@ -24,5 +24,10 @@ module.exports = {
         angular: angular_1.default,
         'angular-template': angular_template_1.default,
     },
-    rules: Object.assign({ [enforce_module_boundaries_1.RULE_NAME]: enforce_module_boundaries_1.default, [nx_plugin_checks_1.RULE_NAME]: nx_plugin_checks_1.default, [dependency_checks_1.RULE_NAME]: dependency_checks_1.default }, resolve_workspace_rules_1.workspaceRules),
+    rules: {
+        [enforce_module_boundaries_1.RULE_NAME]: enforce_module_boundaries_1.default,
+        [nx_plugin_checks_1.RULE_NAME]: nx_plugin_checks_1.default,
+        [dependency_checks_1.RULE_NAME]: dependency_checks_1.default,
+        ...resolve_workspace_rules_1.workspaceRules,
+    },
 };

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.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 replace_package_1 = require("@nx/devkit/src/utils/replace-package");
 const path_1 = require("path");
@@ -14,33 +13,31 @@ const eslintFileNames = [
     '.eslintrc.json',
     'eslint.config.js', // new format that requires `ESLINT_USE_FLAT_CONFIG=true`
 ];
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/eslint-plugin-nx', '@nx/eslint-plugin');
-        /**
-         * Matches:
-         * * // eslint-disable-next-line @nrwl/nx/...
-         * * // eslint-disable-line @nrwl/nx/...
-         * * /* eslint-disable @nrwl/nx/...
-         */
-        const ignoreLineRegex = /(eslint-disable(?:(?:-next)?-line)?\s*)@nrwl\/nx/g;
-        (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (path) => {
-            if ((0, binary_extensions_1.isBinaryPath)(path)) {
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/eslint-plugin-nx', '@nx/eslint-plugin');
+    /**
+     * Matches:
+     * * // eslint-disable-next-line @nrwl/nx/...
+     * * // eslint-disable-line @nrwl/nx/...
+     * * /* eslint-disable @nrwl/nx/...
+     */
+    const ignoreLineRegex = /(eslint-disable(?:(?:-next)?-line)?\s*)@nrwl\/nx/g;
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (path) => {
+        if ((0, binary_extensions_1.isBinaryPath)(path)) {
+            return;
+        }
+        let contents = tree.read(path).toString();
+        if (eslintFileNames.includes((0, path_1.basename)(path))) {
+            if (!contents.includes('@nrwl/nx')) {
                 return;
             }
-            let contents = tree.read(path).toString();
-            if (eslintFileNames.includes((0, path_1.basename)(path))) {
-                if (!contents.includes('@nrwl/nx')) {
-                    return;
-                }
-                contents = contents.replace(new RegExp('@nrwl/nx', 'g'), '@nx');
-            }
-            if (ignoreLineRegex.test(contents)) {
-                contents = contents.replace(ignoreLineRegex, '$1@nx');
-            }
-            tree.write(path, contents);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+            contents = contents.replace(new RegExp('@nrwl/nx', 'g'), '@nx');
+        }
+        if (ignoreLineRegex.test(contents)) {
+            contents = contents.replace(ignoreLineRegex, '$1@nx');
+        }
+        tree.write(path, contents);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/rules/dependency-checks.js

@@ -53,7 +53,6 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
         },
     ],
     create(context, [{ buildTargets, ignoredDependencies, ignoredFiles, checkMissingDependencies, checkObsoleteDependencies, checkVersionMismatches, includeTransitiveDependencies, },]) {
-        var _a;
         if (!context.parserServices.isJSON) {
             return {};
         }
@@ -73,7 +72,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
             return {};
         }
         // check if library has a build target
-        const buildTarget = buildTargets.find((t) => { var _a; return (_a = sourceProject.data.targets) === null || _a === void 0 ? void 0 : _a[t]; });
+        const buildTarget = buildTargets.find((t) => sourceProject.data.targets?.[t]);
         if (!buildTarget) {
             return {};
         }
@@ -85,7 +84,7 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
         });
         const expectedDependencyNames = Object.keys(npmDependencies);
         const projPackageJsonPath = (0, path_1.join)(devkit_1.workspaceRoot, sourceProject.data.root, 'package.json');
-        (_a = globalThis.projPackageJsonDeps) !== null && _a !== void 0 ? _a : (globalThis.projPackageJsonDeps = (0, package_json_utils_1.getProductionDependencies)((0, package_json_utils_1.getPackageJson)(projPackageJsonPath)));
+        globalThis.projPackageJsonDeps ??= (0, package_json_utils_1.getProductionDependencies)((0, package_json_utils_1.getPackageJson)(projPackageJsonPath));
         const projPackageJsonDeps = globalThis.projPackageJsonDeps;
         const rootPackageJsonDeps = (0, package_json_utils_1.getAllDependencies)(rootPackageJson);
         function validateMissingDependencies(node) {

package/src/rules/nx-plugin-checks.js

@@ -82,17 +82,23 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
     },
 });
 function normalizeOptions(sourceProject, options) {
-    const base = Object.assign(Object.assign({}, DEFAULT_OPTIONS), options);
+    const base = { ...DEFAULT_OPTIONS, ...options };
     const pathPrefix = sourceProject.data.root !== '.' ? `${sourceProject.data.root}/` : '';
-    return Object.assign(Object.assign({}, base), { executorsJson: base.executorsJson
+    return {
+        ...base,
+        executorsJson: base.executorsJson
             ? `${pathPrefix}${base.executorsJson}`
-            : undefined, generatorsJson: base.generatorsJson
+            : undefined,
+        generatorsJson: base.generatorsJson
             ? `${pathPrefix}${base.generatorsJson}`
-            : undefined, migrationsJson: base.migrationsJson
+            : undefined,
+        migrationsJson: base.migrationsJson
             ? `${pathPrefix}${base.migrationsJson}`
-            : undefined, packageJson: base.packageJson
+            : undefined,
+        packageJson: base.packageJson
             ? `${pathPrefix}${base.packageJson}`
-            : undefined });
+            : undefined,
+    };
 }
 function checkCollectionFileNode(baseNode, mode, context) {
     const schematicsRootNode = baseNode.properties.find((x) => x.key.type === 'JSONLiteral' && x.key.value === 'schematics');
@@ -280,7 +286,7 @@ function validateImplemenationNode(implementationNode, key, context) {
                     });
                 }
             }
-            catch (_a) {
+            catch {
                 context.report({
                     messageId: 'unableToReadImplementationExports',
                     node: implementationNode.value,
@@ -294,13 +300,12 @@ function validateImplemenationNode(implementationNode, key, context) {
 }
 exports.validateImplemenationNode = validateImplemenationNode;
 function validatePackageGroup(baseNode, context) {
-    var _a, _b, _c;
-    const migrationsNode = (_a = baseNode.properties.find((x) => x.key.type === 'JSONLiteral' &&
+    const migrationsNode = baseNode.properties.find((x) => x.key.type === 'JSONLiteral' &&
         x.value.type === 'JSONObjectExpression' &&
         (x.key.value === 'nx-migrations' ||
             x.key.value === 'ng-update' ||
-            x.key.value === 'migrations'))) === null || _a === void 0 ? void 0 : _a.value;
-    const packageGroupNode = migrationsNode === null || migrationsNode === void 0 ? void 0 : migrationsNode.properties.find((x) => x.key.type === 'JSONLiteral' && x.key.value === 'packageGroup');
+            x.key.value === 'migrations'))?.value;
+    const packageGroupNode = migrationsNode?.properties.find((x) => x.key.type === 'JSONLiteral' && x.key.value === 'packageGroup');
     if (packageGroupNode) {
         // Package group is defined as an array
         if (packageGroupNode.value.type === 'JSONArrayExpression') {
@@ -310,7 +315,7 @@ function validatePackageGroup(baseNode, context) {
             for (const member of members) {
                 const versionPropertyNode = member.properties.find((x) => x.key.type === 'JSONLiteral' && x.key.value === 'version');
                 const packageNode = member.properties.find((x) => x.key.type === 'JSONLiteral' && x.key.value === 'package');
-                const key = (_c = (_b = packageNode === null || packageNode === void 0 ? void 0 : packageNode.value) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : 'unknown';
+                const key = packageNode?.value?.value ?? 'unknown';
                 if (versionPropertyNode) {
                     if (!validateVersionJsonExpression(versionPropertyNode.value, context))
                         context.report({
@@ -348,11 +353,10 @@ function validatePackageGroup(baseNode, context) {
 }
 exports.validatePackageGroup = validatePackageGroup;
 function validateVersionJsonExpression(node, context) {
-    var _a;
     return (node &&
         node.type === 'JSONLiteral' &&
         typeof node.value === 'string' &&
         ((0, semver_1.valid)(node.value) ||
-            ((_a = context.options[0]) === null || _a === void 0 ? void 0 : _a.allowedVersionStrings.includes(node.value))));
+            context.options[0]?.allowedVersionStrings.includes(node.value)));
 }
 exports.validateVersionJsonExpression = validateVersionJsonExpression;

package/src/utils/ast-utils.js

@@ -22,7 +22,6 @@ function tryReadBaseJson() {
  * @returns
  */
 function getBarrelEntryPointByImportScope(importScope) {
-    var _a;
     const tryPaths = (paths, importScope) => {
         // TODO check and warn that the entries of paths[importScope] have no wildcards; that'd be user misconfiguration
         if (paths[importScope])
@@ -47,15 +46,14 @@ function getBarrelEntryPointByImportScope(importScope) {
         return Array.from(result);
     };
     const tsConfigBase = tryReadBaseJson();
-    if (!((_a = tsConfigBase === null || tsConfigBase === void 0 ? void 0 : tsConfigBase.compilerOptions) === null || _a === void 0 ? void 0 : _a.paths))
+    if (!tsConfigBase?.compilerOptions?.paths)
         return [];
     return tryPaths(tsConfigBase.compilerOptions.paths, importScope);
 }
 exports.getBarrelEntryPointByImportScope = getBarrelEntryPointByImportScope;
 function getBarrelEntryPointProjectNode(projectNode) {
-    var _a;
     const tsConfigBase = tryReadBaseJson();
-    if ((_a = tsConfigBase === null || tsConfigBase === void 0 ? void 0 : tsConfigBase.compilerOptions) === null || _a === void 0 ? void 0 : _a.paths) {
+    if (tsConfigBase?.compilerOptions?.paths) {
         const potentialEntryPoints = Object.keys(tsConfigBase.compilerOptions.paths)
             .filter((entry) => {
             const sourceFolderPaths = tsConfigBase.compilerOptions.paths[entry];
@@ -81,7 +79,6 @@ function hasMemberExport(exportedMember, filePath) {
     return ((0, js_1.findNodes)(sourceFile, ts.SyntaxKind.Identifier).filter((identifier) => identifier.text === exportedMember).length > 0);
 }
 function getRelativeImportPath(exportedMember, filePath, basePath) {
-    var _a, _b;
     if ((0, fs_1.lstatSync)(filePath).isDirectory()) {
         const file = (0, fs_1.readdirSync)(filePath).find((file) => /^index\.[jt]sx?$/.exec(file));
         if (file) {
@@ -130,7 +127,7 @@ function getRelativeImportPath(exportedMember, filePath, basePath) {
                         hasExport = true;
                         break;
                     }
-                    if ((_a = (0, type_utils_1.getModifiers)(parent)) === null || _a === void 0 ? void 0 : _a.find((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword)) {
+                    if ((0, type_utils_1.getModifiers)(parent)?.find((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword)) {
                         /**
                          * if we get to a function export declaration we need to verify whether the
                          * exported function is actually the member we are searching for. Otherwise
@@ -151,7 +148,7 @@ function getRelativeImportPath(exportedMember, filePath, basePath) {
                          * starting from `SOME_CONSTANT` identifier usages.
                          */
                         if (parent.kind === ts.SyntaxKind.FunctionDeclaration) {
-                            const parentName = (_b = parent.name) === null || _b === void 0 ? void 0 : _b.text;
+                            const parentName = parent.name?.text;
                             if (parentName === exportedMember) {
                                 hasExport = true;
                                 break;

package/src/utils/config-utils.js

@@ -11,7 +11,7 @@ function packageExists(name) {
         require.resolve(name);
         return true;
     }
-    catch (_a) {
+    catch {
         return false;
     }
 }

package/src/utils/package-json-utils.js

@@ -4,11 +4,20 @@ exports.getPackageJson = exports.getProductionDependencies = exports.getAllDepen
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 function getAllDependencies(packageJson) {
-    return Object.assign(Object.assign(Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies), packageJson.peerDependencies), packageJson.optionalDependencies);
+    return {
+        ...packageJson.dependencies,
+        ...packageJson.devDependencies,
+        ...packageJson.peerDependencies,
+        ...packageJson.optionalDependencies,
+    };
 }
 exports.getAllDependencies = getAllDependencies;
 function getProductionDependencies(packageJson) {
-    return Object.assign(Object.assign(Object.assign({}, packageJson.dependencies), packageJson.peerDependencies), packageJson.optionalDependencies);
+    return {
+        ...packageJson.dependencies,
+        ...packageJson.peerDependencies,
+        ...packageJson.optionalDependencies,
+    };
 }
 exports.getProductionDependencies = getProductionDependencies;
 function getPackageJson(path) {

package/src/utils/project-graph-utils.js

@@ -30,7 +30,7 @@ function ensureGlobalProjectGraph(ruleName) {
             global.projectFileMap = (0, nx_deps_cache_1.readProjectFileMapCache)().projectFileMap;
             global.targetProjectLocator = new internal_1.TargetProjectLocator(projectGraph.nodes, projectGraph.externalNodes);
         }
-        catch (_a) {
+        catch {
             const WARNING_PREFIX = `${chalk.reset.keyword('orange')('warning')}`;
             const RULE_NAME_SUFFIX = `${chalk.reset.dim(`@nx/${ruleName}`)}`;
             process.stdout

package/src/utils/runtime-lint-utils.js

@@ -108,9 +108,8 @@ function isAbsoluteImportIntoAnotherProject(imp, workspaceLayout = { libsDir: 'l
 }
 exports.isAbsoluteImportIntoAnotherProject = isAbsoluteImportIntoAnotherProject;
 function findProjectUsingImport(projectGraph, targetProjectLocator, filePath, imp) {
-    var _a;
     const target = targetProjectLocator.findProjectWithImport(imp, filePath);
-    return projectGraph.nodes[target] || ((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[target]);
+    return projectGraph.nodes[target] || projectGraph.externalNodes?.[target];
 }
 exports.findProjectUsingImport = findProjectUsingImport;
 function findConstraintsFor(depConstraints, sourceProject) {
@@ -158,11 +157,11 @@ function isConstraintBanningProject(externalProject, constraint, imp) {
         return false;
     }
     /* Check if import is banned... */
-    if (bannedExternalImports === null || bannedExternalImports === void 0 ? void 0 : bannedExternalImports.some((importDefinition) => mapGlobToRegExp(importDefinition).test(imp))) {
+    if (bannedExternalImports?.some((importDefinition) => mapGlobToRegExp(importDefinition).test(imp))) {
         return true;
     }
     /* ... then check if there is a whitelist and if there is a match in the whitelist.  */
-    return allowedExternalImports === null || allowedExternalImports === void 0 ? void 0 : allowedExternalImports.every((importDefinition) => !imp.startsWith(packageName) ||
+    return allowedExternalImports?.every((importDefinition) => !imp.startsWith(packageName) ||
         !mapGlobToRegExp(importDefinition).test(imp));
 }
 function hasBannedImport(source, target, depConstraints, imp) {
@@ -322,7 +321,6 @@ function isAngularSecondaryEntrypoint(importExpr, filePath, projectRoot) {
 }
 exports.isAngularSecondaryEntrypoint = isAngularSecondaryEntrypoint;
 function fileIsSecondaryEntryPoint(file, projectRoot) {
-    var _a, _b;
     let parent = (0, devkit_1.joinPathFragments)(file, '../');
     while (parent !== `${projectRoot}/`) {
         // we need to find closest existing ng-package.json
@@ -330,7 +328,7 @@ function fileIsSecondaryEntryPoint(file, projectRoot) {
         const ngPackageContent = (0, fileutils_1.readFileIfExisting)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, parent, 'ng-package.json'));
         if (ngPackageContent) {
             // https://github.com/ng-packagr/ng-packagr/blob/23c718d04eea85e015b4c261310b7bd0c39e5311/src/ng-package.schema.json#L54
-            const entryFile = (_b = (_a = (0, devkit_1.parseJson)(ngPackageContent)) === null || _a === void 0 ? void 0 : _a.lib) === null || _b === void 0 ? void 0 : _b.entryFile;
+            const entryFile = (0, devkit_1.parseJson)(ngPackageContent)?.lib?.entryFile;
             return entryFile && file === (0, devkit_1.joinPathFragments)(parent, entryFile);
         }
         parent = (0, devkit_1.joinPathFragments)(parent, '../');