From 81012f9b9dc4027d1a3f39fc38823a61b20316d5 Mon Sep 17 00:00:00 2001 From: Adrian Baran Date: Thu, 17 Nov 2022 15:49:20 -0600 Subject: [PATCH] refactor(no-input-rename): move logic to isAliasNameAllowed --- .../src/rules/no-input-rename.ts | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/packages/eslint-plugin/src/rules/no-input-rename.ts b/packages/eslint-plugin/src/rules/no-input-rename.ts index 1da6e4bf5..aa81e9a55 100644 --- a/packages/eslint-plugin/src/rules/no-input-rename.ts +++ b/packages/eslint-plugin/src/rules/no-input-rename.ts @@ -93,7 +93,6 @@ export default createESLintRule({ ); if ( - aliasName === selectorDirectiveName || allowedNames.includes(aliasName) || (ariaAttributeKeys.has(aliasName) && propertyName === kebabToCamelCase(aliasName)) @@ -107,7 +106,14 @@ export default createESLintRule({ messageId: 'noInputRename', fix: (fixer) => fixer.remove(node), }); - } else if (!isAliasNameAllowed(selectors, propertyName, aliasName)) { + } else if ( + !isAliasNameAllowed( + selectors, + propertyName, + aliasName, + selectorDirectiveName, + ) + ) { context.report({ node, messageId: 'noInputRename', @@ -156,7 +162,14 @@ export default createESLintRule({ ASTUtils.getReplacementText(node, propertyName), ), }); - } else if (!isAliasNameAllowed(selectors, propertyName, aliasName)) { + } else if ( + !isAliasNameAllowed( + selectors, + propertyName, + aliasName, + selectorDirectiveName, + ) + ) { context.report({ node, messageId: 'noInputRename', @@ -191,10 +204,12 @@ function isAliasNameAllowed( selectors: ReadonlySet, propertyName: string, aliasName: string, + selectorDirectiveName: string, ): boolean { return [...selectors].some((selector) => { return ( selector === aliasName || + selectorDirectiveName === aliasName || composedName(selector, propertyName) === aliasName ); });