Merge branch 'main' into svelte-5-adapter

Author: lachlancollins

.github/workflows/release.yml

@@ -36,6 +36,8 @@ jobs:
         run: npx nx-cloud stop-all-agents
       - name: Version Packages
         run: pnpm run changeset:version
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Commit version files
         run: |
           if [[ -n "$(git status --porcelain)" ]]; then
@@ -48,7 +50,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish Packages
-        run: pnpm run changeset:publish
+        run: |
+          npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
+          pnpm run changeset:publish
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Upload coverage to Codecov

examples/react/algolia/package.json

@@ -15,7 +15,7 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.90.1",
+    "@tanstack/eslint-plugin-query": "^5.90.2",
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
     "@vitejs/plugin-react": "^4.3.4",

examples/react/basic/package.json

@@ -17,7 +17,7 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.90.1",
+    "@tanstack/eslint-plugin-query": "^5.90.2",
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
     "@vitejs/plugin-react": "^4.3.4",

examples/react/eslint-legacy/package.json

@@ -17,7 +17,7 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.90.1",
+    "@tanstack/eslint-plugin-query": "^5.90.2",
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
     "@vitejs/plugin-react": "^4.3.4",

examples/solid/simple/package.json

@@ -13,7 +13,7 @@
     "solid-js": "^1.9.7"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.90.1",
+    "@tanstack/eslint-plugin-query": "^5.90.2",
     "typescript": "5.8.3",
     "vite": "^6.3.6",
     "vite-plugin-solid": "^2.11.6"

packages/eslint-plugin-query/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @tanstack/eslint-plugin-query
+
+## 5.90.2
+
+### Patch Changes
+
+- fix: exhaustive-deps with variables and type assertions ([#9687](https://github.com/TanStack/query/pull/9687))

packages/eslint-plugin-query/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/eslint-plugin-query",
-  "version": "5.90.1",
+  "version": "5.90.2",
   "description": "ESLint plugin for TanStack Query",
   "author": "Eliya Cohen",
   "license": "MIT",

packages/eslint-plugin-query/src/__tests__/exhaustive-deps.test.ts

@@ -226,6 +226,39 @@ ruleTester.run('exhaustive-deps', rule, {
           })
       `,
     },
+    {
+      name: 'should pass with queryKeyFactory result assigned to a variable',
+      code: `
+        function fooQueryKeyFactory(dep: string) {
+            return ["foo", dep];
+        }
+
+        const useFoo = (dep: string) => {
+          const queryKey = fooQueryKeyFactory(dep);
+          return useQuery({
+              queryKey,
+              queryFn: () => Promise.resolve(dep),
+            })
+          }
+      `,
+    },
+    {
+      name: 'should pass with queryKeyFactory result assigned to a variable 2',
+      code: `
+        function fooQueryKeyFactory(dep: string) {
+            const x = ["foo", dep] as const;
+            return x as const;
+        }
+
+        const useFoo = (dep: string) => {
+          const queryKey = fooQueryKeyFactory(dep);
+          return useQuery({
+              queryKey,
+              queryFn: () => Promise.resolve(dep),
+            })
+          }
+      `,
+    },
     {
       name: 'should not treat new Error as missing dependency',
       code: normalizeIndent`
@@ -246,6 +279,30 @@ ruleTester.run('exhaustive-deps', rule, {
         }
       `,
     },
+    {
+      name: 'should see id when there is a const assertion of a variable dereference',
+      code: normalizeIndent`
+        const useX = (id: number) => {
+          const queryKey = ['foo', id]
+          return useQuery({
+            queryKey: queryKey as const,
+            queryFn: async () => id,
+          })
+        }
+      `,
+    },
+    {
+      name: 'should see id when there is a const assertion assigned to a variable',
+      code: normalizeIndent`
+        const useX = (id: number) => {
+          const queryKey = ['foo', id] as const
+          return useQuery({
+            queryKey,
+            queryFn: async () => id,
+          })
+        }
+      `,
+    },
     {
       name: 'should not fail if queryKey is having the whole object while queryFn uses some props of it',
       code: normalizeIndent`

packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.rule.ts

@@ -65,25 +65,10 @@ export const rule = createRule({
           return
         }
 
-        let queryKeyNode = queryKey.value
-
-        if (
-          queryKeyNode.type === AST_NODE_TYPES.TSAsExpression &&
-          queryKeyNode.expression.type === AST_NODE_TYPES.ArrayExpression
-        ) {
-          queryKeyNode = queryKeyNode.expression
-        }
-
-        if (queryKeyNode.type === AST_NODE_TYPES.Identifier) {
-          const expression = ASTUtils.getReferencedExpressionByIdentifier({
-            context,
-            node: queryKeyNode,
-          })
-
-          if (expression?.type === AST_NODE_TYPES.ArrayExpression) {
-            queryKeyNode = expression
-          }
-        }
+        const queryKeyNode = dereferenceVariablesAndTypeAssertions(
+          queryKey.value,
+          context,
+        )
 
         const externalRefs = ASTUtils.getExternalRefs({
           scopeManager,
@@ -182,3 +167,38 @@ function getQueryFnRelevantNode(queryFn: TSESTree.Property) {
 
   return queryFn.value.consequent
 }
+
+function dereferenceVariablesAndTypeAssertions(
+  queryKeyNode: TSESTree.Node,
+  context: Readonly<TSESLint.RuleContext<string, ReadonlyArray<unknown>>>,
+) {
+  const visitedNodes = new Set<TSESTree.Node>()
+
+  for (let i = 0; i < 1 << 8; ++i) {
+    if (visitedNodes.has(queryKeyNode)) {
+      return queryKeyNode
+    }
+    visitedNodes.add(queryKeyNode)
+
+    switch (queryKeyNode.type) {
+      case AST_NODE_TYPES.TSAsExpression:
+        queryKeyNode = queryKeyNode.expression
+        break
+      case AST_NODE_TYPES.Identifier: {
+        const expression = ASTUtils.getReferencedExpressionByIdentifier({
+          context,
+          node: queryKeyNode,
+        })
+
+        if (expression == null) {
+          return queryKeyNode
+        }
+        queryKeyNode = expression
+        break
+      }
+      default:
+        return queryKeyNode
+    }
+  }
+  return queryKeyNode
+}