@tanstack/eslint-plugin-query 5.101.3 → 5.102.0

package/build/modern/rules.d.cts

@@ -1 +1,8 @@
-export { rules } from './_tsup-dts-rollup.cjs';
+import { ExtraRuleDocs } from "./types.cjs";
+import { ESLintUtils } from "@typescript-eslint/utils";
+//#region src/rules.d.ts
+declare const rules: Record<string, ESLintUtils.RuleModule<string, ReadonlyArray<unknown>, ExtraRuleDocs, ESLintUtils.RuleListener>>;
+//#endregion
+export { rules };
+
+//# sourceMappingURL=rules.d.cts.map

package/build/modern/rules.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rules.d.cts","names":[],"sources":["../../src/rules.ts"],"mappings":";;;cAWa,OAAO,eAElB,YAAY,mBAEV,wBACA,eACA,YAAY"}

package/build/modern/rules.d.ts

@@ -1 +1,8 @@
-export { rules } from './_tsup-dts-rollup.js';
+import { ExtraRuleDocs } from "./types.js";
+import { ESLintUtils } from "@typescript-eslint/utils";
+//#region src/rules.d.ts
+declare const rules: Record<string, ESLintUtils.RuleModule<string, ReadonlyArray<unknown>, ExtraRuleDocs, ESLintUtils.RuleListener>>;
+//#endregion
+export { rules };
+
+//# sourceMappingURL=rules.d.ts.map

package/build/modern/rules.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rules.d.ts","names":[],"sources":["../../src/rules.ts"],"mappings":";;;cAWa,OAAO,eAElB,YAAY,mBAEV,wBACA,eACA,YAAY"}

package/build/modern/rules.js

@@ -1,7 +1,3 @@
-import {
-  rules
-} from "./chunk-VALYN6GR.js";
-export {
-  rules
-};
-//# sourceMappingURL=rules.js.map
+import { t as rules } from "./rules-DzixDjO7.js";
+export { rules };
+

package/build/modern/types.cjs

@@ -1,20 +1,2 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 
-// src/types.ts
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
-module.exports = module.exports.default
-//# sourceMappingURL=types.cjs.map

package/build/modern/types.d.cts

@@ -1 +1,8 @@
-export { ExtraRuleDocs } from './_tsup-dts-rollup.cjs';
+//#region src/types.d.ts
+type ExtraRuleDocs = {
+  recommended: 'strict' | 'error' | 'warn';
+};
+//#endregion
+export { ExtraRuleDocs };
+
+//# sourceMappingURL=types.d.cts.map

package/build/modern/types.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.cts","names":[],"sources":["../../src/types.ts"],"mappings":";KAAY;EACV"}

package/build/modern/types.d.ts

@@ -1 +1,8 @@
-export { ExtraRuleDocs } from './_tsup-dts-rollup.js';
+//#region src/types.d.ts
+type ExtraRuleDocs = {
+  recommended: 'strict' | 'error' | 'warn';
+};
+//#endregion
+export { ExtraRuleDocs };
+
+//# sourceMappingURL=types.d.ts.map

package/build/modern/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/types.ts"],"mappings":";KAAY;EACV"}

package/build/modern/types.js

@@ -1 +1,2 @@
-//# sourceMappingURL=types.js.map
+export {};
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/eslint-plugin-query",
-  "version": "5.101.3",
+  "version": "5.102.0",
   "description": "ESLint plugin for TanStack Query",
   "author": "Eliya Cohen",
   "license": "MIT",
@@ -51,7 +51,7 @@
   },
   "peerDependencies": {
     "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-    "typescript": "^5.4.0 || ^6.0.0"
+    "typescript": "^5.6.0 || ^6.0.0 || ^7.0.0"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -63,17 +63,15 @@
     "compile": "tsc --build",
     "test:eslint": "eslint --concurrency=auto ./src",
     "test:types": "npm-run-all --serial test:types:*",
-    "test:types:ts54": "node ../../node_modules/typescript54/lib/tsc.js --build",
-    "test:types:ts55": "node ../../node_modules/typescript55/lib/tsc.js --build",
     "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js --build",
     "test:types:ts57": "node ../../node_modules/typescript57/lib/tsc.js --build",
     "test:types:ts58": "node ../../node_modules/typescript58/lib/tsc.js --build",
     "test:types:ts59": "node ../../node_modules/typescript59/lib/tsc.js --build",
     "test:types:tscurrent": "tsc --build",
-    "test:types:ts60": "node ../../node_modules/typescript60/lib/tsc.js --build",
+    "test:types:ts70": "node ../../node_modules/typescript70/lib/tsc.js --build",
     "test:lib": "vitest",
     "test:lib:dev": "pnpm run test:lib --watch",
     "test:build": "publint --strict && attw --pack",
-    "build": "tsup --tsconfig tsconfig.prod.json"
+    "build": "tsdown --tsconfig tsconfig.prod.json"
   }
 }

package/src/rules/exhaustive-deps/exhaustive-deps.utils.ts

@@ -55,11 +55,24 @@ export const ExhaustiveDepsUtils = {
 
     return (
       reference.identifier.name !== 'undefined' &&
+      !ExhaustiveDepsUtils.isFunctionCallTarget(reference.identifier) &&
       reference.identifier.parent.type !== AST_NODE_TYPES.NewExpression &&
       !ExhaustiveDepsUtils.isInstanceOfKind(reference.identifier.parent)
     )
   },
 
+  isFunctionCallTarget(
+    identifier: TSESTree.Identifier | TSESTree.JSXIdentifier,
+  ): boolean {
+    const callee = ASTUtils.traverseUpMemberExpression(identifier)
+
+    return (
+      callee.parent !== undefined &&
+      callee.parent.type === AST_NODE_TYPES.CallExpression &&
+      callee.parent.callee === callee
+    )
+  },
+
   /**
    * Given required refs and existing queryKey entries, compute missing dependency paths
    * respecting allowlisted variables and types.
@@ -272,7 +285,7 @@ export const ExhaustiveDepsUtils = {
   isInstanceOfKind(node: TSESTree.Node) {
     return (
       node.type === AST_NODE_TYPES.BinaryExpression &&
-      node.operator === 'instanceof'
+      (node as TSESTree.SymmetricBinaryExpression).operator === 'instanceof'
     )
   },
 
@@ -296,11 +309,7 @@ export const ExhaustiveDepsUtils = {
   }): { path: string; root: string; coversRootMembers: boolean } | null {
     const { identifier, sourceCode } = params
 
-    const fullChainNode = ASTUtils.traverseUpOnly(identifier, [
-      AST_NODE_TYPES.MemberExpression,
-      AST_NODE_TYPES.TSNonNullExpression,
-      AST_NODE_TYPES.Identifier,
-    ])
+    const fullChainNode = ASTUtils.traverseUpMemberExpression(identifier)
 
     const fullText = ExhaustiveDepsUtils.normalizeChain(
       sourceCode.getText(fullChainNode),

package/src/rules/no-unstable-deps/no-unstable-deps.rule.ts

@@ -35,9 +35,9 @@ export const rule = createRule({
   defaultOptions: [],
 
   create: detectTanstackQueryImports((context, _options, helpers) => {
-    const trackedVariables: Record<string, string> = {}
-    const trackedCustomHooks: Record<string, string> = {}
-    const hookAliasMap: Record<string, string> = {}
+    const trackedVariables: Record<string, string> = Object.create(null)
+    const trackedCustomHooks: Record<string, string> = Object.create(null)
+    const hookAliasMap: Record<string, string> = Object.create(null)
     const pendingVariableDeclarators: Array<TSESTree.VariableDeclarator> = []
     const pendingDependencyChecks: Array<{
       reactHook: string

package/src/utils/ast-utils.ts

@@ -46,91 +46,6 @@ export const ASTUtils = {
       ASTUtils.isPropertyWithIdentifierKey(x, key),
     )
   },
-  getNestedIdentifiers(node: TSESTree.Node): Array<TSESTree.Identifier> {
-    const identifiers: Array<TSESTree.Identifier> = []
-
-    if (ASTUtils.isIdentifier(node)) {
-      identifiers.push(node)
-    }
-
-    if ('arguments' in node) {
-      node.arguments.forEach((x) => {
-        identifiers.push(...ASTUtils.getNestedIdentifiers(x))
-      })
-    }
-
-    if ('elements' in node) {
-      node.elements.forEach((x) => {
-        if (x !== null) {
-          identifiers.push(...ASTUtils.getNestedIdentifiers(x))
-        }
-      })
-    }
-
-    if ('properties' in node) {
-      node.properties.forEach((x) => {
-        identifiers.push(...ASTUtils.getNestedIdentifiers(x))
-      })
-    }
-
-    if ('expressions' in node) {
-      node.expressions.forEach((x) => {
-        identifiers.push(...ASTUtils.getNestedIdentifiers(x))
-      })
-    }
-
-    if ('left' in node) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.left))
-    }
-
-    if ('right' in node) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.right))
-    }
-
-    if (node.type === AST_NODE_TYPES.Property) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.value))
-    }
-
-    if (node.type === AST_NODE_TYPES.SpreadElement) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.argument))
-    }
-
-    if (node.type === AST_NODE_TYPES.MemberExpression) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.object))
-    }
-
-    if (node.type === AST_NODE_TYPES.UnaryExpression) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.argument))
-    }
-
-    if (node.type === AST_NODE_TYPES.ChainExpression) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.expression))
-    }
-
-    if (node.type === AST_NODE_TYPES.TSNonNullExpression) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.expression))
-    }
-
-    if (node.type === AST_NODE_TYPES.ArrowFunctionExpression) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.body))
-    }
-
-    if (node.type === AST_NODE_TYPES.FunctionExpression) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.body))
-    }
-
-    if (node.type === AST_NODE_TYPES.BlockStatement) {
-      identifiers.push(
-        ...node.body.map((body) => ASTUtils.getNestedIdentifiers(body)).flat(),
-      )
-    }
-
-    if (node.type === AST_NODE_TYPES.ReturnStatement && node.argument) {
-      identifiers.push(...ASTUtils.getNestedIdentifiers(node.argument))
-    }
-
-    return identifiers
-  },
   traverseUpOnly(
     identifier: TSESTree.Node,
     allowedNodeTypes: Array<AST_NODE_TYPES>,
@@ -143,6 +58,21 @@ export const ASTUtils = {
 
     return identifier
   },
+  traverseUpMemberExpression(node: TSESTree.Node): TSESTree.Node {
+    const parent = node.parent
+
+    if (
+      parent !== undefined &&
+      ((parent.type === AST_NODE_TYPES.MemberExpression &&
+        parent.object === node) ||
+        parent.type === AST_NODE_TYPES.ChainExpression ||
+        parent.type === AST_NODE_TYPES.TSNonNullExpression)
+    ) {
+      return ASTUtils.traverseUpMemberExpression(parent)
+    }
+
+    return node
+  },
   isDeclaredInNode(params: {
     functionNode: TSESTree.Node
     reference: TSESLint.Scope.Reference
@@ -184,10 +114,22 @@ export const ASTUtils = {
     const references = collectReferences(scope)
       .filter((x) => x.isRead() && !scope.set.has(x.identifier.name))
       .map((x) => {
-        const referenceNode = ASTUtils.traverseUpOnly(x.identifier, [
-          AST_NODE_TYPES.MemberExpression,
-          AST_NODE_TYPES.Identifier,
-        ])
+        const memberPath = ASTUtils.traverseUpMemberExpression(x.identifier)
+        const memberExpression = memberPath.parent
+        const isComputedCallProperty =
+          memberExpression !== undefined &&
+          memberExpression.type === AST_NODE_TYPES.MemberExpression &&
+          memberExpression.computed &&
+          memberExpression.property === memberPath &&
+          memberExpression.parent.type === AST_NODE_TYPES.CallExpression &&
+          memberExpression.parent.callee === memberExpression
+
+        const referenceNode = isComputedCallProperty
+          ? memberPath
+          : ASTUtils.traverseUpOnly(x.identifier, [
+              AST_NODE_TYPES.MemberExpression,
+              AST_NODE_TYPES.Identifier,
+            ])
 
         return {
           variable: x,
@@ -206,27 +148,6 @@ export const ASTUtils = {
 
     return uniqueBy(externalRefs, (x) => x.text).map((x) => x.variable)
   },
-  mapKeyNodeToText(
-    node: TSESTree.Node,
-    sourceCode: Readonly<TSESLint.SourceCode>,
-  ) {
-    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,
-      '$1',
-    )
-  },
   isValidReactComponentOrHookName(
     identifier: TSESTree.Identifier | null | undefined,
   ) {
@@ -289,92 +210,4 @@ export const ASTUtils = {
 
     return resolvedNode.init
   },
-  getClosestVariableDeclarator(node: TSESTree.Node) {
-    let currentNode: TSESTree.Node | undefined = node
-
-    while (currentNode.type !== AST_NODE_TYPES.Program) {
-      if (currentNode.type === AST_NODE_TYPES.VariableDeclarator) {
-        return currentNode
-      }
-
-      currentNode = currentNode.parent
-    }
-
-    return undefined
-  },
-  getNestedReturnStatements(
-    node: TSESTree.Node,
-  ): Array<TSESTree.ReturnStatement> {
-    const returnStatements: Array<TSESTree.ReturnStatement> = []
-
-    if (node.type === AST_NODE_TYPES.ReturnStatement) {
-      returnStatements.push(node)
-    }
-
-    if ('body' in node && node.body !== undefined && node.body !== null) {
-      Array.isArray(node.body)
-        ? node.body.forEach((x) => {
-            returnStatements.push(...ASTUtils.getNestedReturnStatements(x))
-          })
-        : returnStatements.push(
-            ...ASTUtils.getNestedReturnStatements(node.body),
-          )
-    }
-
-    if ('consequent' in node) {
-      Array.isArray(node.consequent)
-        ? node.consequent.forEach((x) => {
-            returnStatements.push(...ASTUtils.getNestedReturnStatements(x))
-          })
-        : returnStatements.push(
-            ...ASTUtils.getNestedReturnStatements(node.consequent),
-          )
-    }
-
-    if ('alternate' in node && node.alternate !== null) {
-      Array.isArray(node.alternate)
-        ? node.alternate.forEach((x) => {
-            returnStatements.push(...ASTUtils.getNestedReturnStatements(x))
-          })
-        : returnStatements.push(
-            ...ASTUtils.getNestedReturnStatements(node.alternate),
-          )
-    }
-
-    if ('cases' in node) {
-      node.cases.forEach((x) => {
-        returnStatements.push(...ASTUtils.getNestedReturnStatements(x))
-      })
-    }
-
-    if ('block' in node) {
-      returnStatements.push(...ASTUtils.getNestedReturnStatements(node.block))
-    }
-
-    if ('handler' in node && node.handler !== null) {
-      returnStatements.push(...ASTUtils.getNestedReturnStatements(node.handler))
-    }
-
-    if ('finalizer' in node && node.finalizer !== null) {
-      returnStatements.push(
-        ...ASTUtils.getNestedReturnStatements(node.finalizer),
-      )
-    }
-
-    if (
-      'expression' in node &&
-      node.expression !== true &&
-      node.expression !== false
-    ) {
-      returnStatements.push(
-        ...ASTUtils.getNestedReturnStatements(node.expression),
-      )
-    }
-
-    if ('test' in node && node.test !== null) {
-      returnStatements.push(...ASTUtils.getNestedReturnStatements(node.test))
-    }
-
-    return returnStatements
-  },
 }