fix(eslint-plugin-query): handle non-null at then end of var in exhau…

…stive-deps (#8385)
TanStack · Dec 2, 2024 · d9d2728 · d9d2728
1 parent 12b6782
commit d9d2728
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/eslint-plugin-query/src/__tests__/exhaustive-deps.test.ts b/packages/eslint-plugin-query/src/__tests__/exhaustive-deps.test.ts
@@ -497,6 +497,18 @@ ruleTester.run('exhaustive-deps', rule, {
         }
       `,
     },
+    {
+      name: 'should pass with optional chaining as key and non-null assertion at the end of the variable in queryFn',
+      code: `
+        function useTest(data?: any) {
+          return useQuery({
+            queryKey: ['query-name', data?.address],
+            queryFn: async () => sendQuery(data!.address!),
+            enabled: !!data?.address,
+          })
+        }
+      `,
+    },
   ],
   invalid: [
     {

diff --git a/packages/eslint-plugin-query/src/utils/ast-utils.ts b/packages/eslint-plugin-query/src/utils/ast-utils.ts
@@ -234,8 +234,8 @@ export const ASTUtils = {
     sourceCode: Readonly<TSESLint.SourceCode>,
   ) {
     return ASTUtils.mapKeyNodeToText(node, sourceCode).replace(
-      /(\?\.|!\.)/g,
-      '.',
+      /(?:\?(\.)|!)/g,
+      '$1',
     )
   },
   isValidReactComponentOrHookName(