Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions packages/eslint-plugin-query/src/__tests__/exhaustive-deps.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,30 @@ ruleTester.run('exhaustive-deps', rule, {
};
`,
},
{
name: 'should pass with optional chaining as key',
code: `
function useTest(data?: any) {
return useQuery({
queryKey: ['query-name', data?.address],
queryFn: async () => sendQuery(data.address),
enabled: !!data?.address,
})
}
`,
},
{
name: 'should pass with optional chaining as key and non-null assertion in queryFn',
code: `
function useTest(data?: any) {
return useQuery({
queryKey: ['query-name', data?.address],
queryFn: async () => sendQuery(data!.address),
enabled: !!data?.address,
})
}
`,
},
],
invalid: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,16 @@ export const rule = createRule({

const existingKeys = ASTUtils.getNestedIdentifiers(queryKeyNode).map(
(identifier) =>
ASTUtils.mapKeyNodeToText(identifier, context.sourceCode),
ASTUtils.mapKeyNodeToBaseText(identifier, context.sourceCode),
)

const missingRefs = relevantRefs
.map((ref) => ({
ref: ref,
text: ASTUtils.mapKeyNodeToText(ref.identifier, context.sourceCode),
text: ASTUtils.mapKeyNodeToBaseText(
ref.identifier,
context.sourceCode,
),
}))
.filter(({ ref, text }) => {
return (
Expand Down
10 changes: 10 additions & 0 deletions packages/eslint-plugin-query/src/utils/ast-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,20 @@ export const ASTUtils = {
return sourceCode.getText(
ASTUtils.traverseUpOnly(node, [
AST_NODE_TYPES.MemberExpression,
AST_NODE_TYPES.TSNonNullExpression,
AST_NODE_TYPES.Identifier,
]),
)
},
mapKeyNodeToBaseText(
node: TSESTree.Node,
sourceCode: Readonly<TSESLint.SourceCode>,
) {
return ASTUtils.mapKeyNodeToText(node, sourceCode).replace(
/(\?\.|!\.)/g,
'.',
)
},
isValidReactComponentOrHookName(
identifier: TSESTree.Identifier | null | undefined,
) {
Expand Down