Skip to content

Commit 904a345

Browse files
committed
refactor: simplify nested if statements
1 parent c0af918 commit 904a345

File tree

1 file changed

+51
-20
lines changed

1 file changed

+51
-20
lines changed

lib/rules/prefer-screen-queries.ts

+51-20
Original file line numberDiff line numberDiff line change
@@ -155,31 +155,62 @@ export default createTestingLibraryRule<Options, MessageIds>({
155155
return;
156156
}
157157

158-
if (isMemberExpression(identifierNode.parent)) {
159-
const memberExpressionNode = identifierNode.parent;
160-
if (
161-
isCallExpression(memberExpressionNode.object) &&
162-
ASTUtils.isIdentifier(memberExpressionNode.object.callee) &&
163-
memberExpressionNode.object.callee.name !== 'within' &&
164-
isReportableRender(memberExpressionNode.object.callee) &&
165-
!usesContainerOrBaseElement(memberExpressionNode.object)
166-
) {
167-
reportInvalidUsage(identifierNode);
168-
} else if (
169-
ASTUtils.isIdentifier(memberExpressionNode.object) &&
170-
!isIdentifierAllowed(memberExpressionNode.object.name)
171-
) {
172-
reportInvalidUsage(identifierNode);
173-
}
174-
} else {
158+
if (!isMemberExpression(identifierNode.parent)) {
175159
const isSafeDestructuredQuery = safeDestructuredQueries.some(
176160
(queryName) => queryName === identifierNode.name
177161
);
178-
179-
if (!isSafeDestructuredQuery) {
180-
reportInvalidUsage(identifierNode);
162+
if (isSafeDestructuredQuery) {
163+
return;
181164
}
165+
166+
reportInvalidUsage(identifierNode);
167+
return;
182168
}
169+
170+
const memberExpressionNode = identifierNode.parent;
171+
if (
172+
isCallExpression(memberExpressionNode.object) &&
173+
ASTUtils.isIdentifier(memberExpressionNode.object.callee) &&
174+
memberExpressionNode.object.callee.name !== 'within' &&
175+
isReportableRender(memberExpressionNode.object.callee) &&
176+
!usesContainerOrBaseElement(memberExpressionNode.object)
177+
) {
178+
reportInvalidUsage(identifierNode);
179+
return;
180+
}
181+
182+
if (
183+
ASTUtils.isIdentifier(memberExpressionNode.object) &&
184+
!isIdentifierAllowed(memberExpressionNode.object.name)
185+
) {
186+
reportInvalidUsage(identifierNode);
187+
}
188+
189+
// if (isMemberExpression(identifierNode.parent)) {
190+
// const memberExpressionNode = identifierNode.parent;
191+
// if (
192+
// isCallExpression(memberExpressionNode.object) &&
193+
// ASTUtils.isIdentifier(memberExpressionNode.object.callee) &&
194+
// memberExpressionNode.object.callee.name !== 'within' &&
195+
// isReportableRender(memberExpressionNode.object.callee) &&
196+
// !usesContainerOrBaseElement(memberExpressionNode.object)
197+
// ) {
198+
// reportInvalidUsage(identifierNode);
199+
// } else if (
200+
// ASTUtils.isIdentifier(memberExpressionNode.object) &&
201+
// !isIdentifierAllowed(memberExpressionNode.object.name)
202+
// ) {
203+
// reportInvalidUsage(identifierNode);
204+
// }
205+
// } else {
206+
// const isSafeDestructuredQuery = safeDestructuredQueries.some(
207+
// (queryName) => queryName === identifierNode.name
208+
// );
209+
//
210+
// if (!isSafeDestructuredQuery) {
211+
// reportInvalidUsage(identifierNode);
212+
// }
213+
// }
183214
},
184215
};
185216
},

0 commit comments

Comments
 (0)