Merge branch 'main' into react-query/test/infinite-query-options

Author: gwansikk

examples/react/algolia/package.json

@@ -16,7 +16,7 @@
     "react-dom": "19.0.0-rc-4c2e457c7c-20240522"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.59.4",
+    "@tanstack/eslint-plugin-query": "^5.59.7",
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
     "@vitejs/plugin-react": "^4.3.1",

examples/react/basic/package.json

@@ -17,7 +17,7 @@
     "react-dom": "19.0.0-rc-4c2e457c7c-20240522"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.59.4",
+    "@tanstack/eslint-plugin-query": "^5.59.7",
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
     "@vitejs/plugin-react": "^4.3.1",

examples/solid/simple/package.json

@@ -14,7 +14,7 @@
     "solid-js": "^1.8.19"
   },
   "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.59.4",
+    "@tanstack/eslint-plugin-query": "^5.59.7",
     "typescript": "5.3.3",
     "vite": "^5.3.5",
     "vite-plugin-solid": "^2.10.2"

packages/eslint-plugin-query/package.json

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

packages/eslint-plugin-query/src/__tests__/infinite-query-property-order.rule.test.ts

@@ -24,6 +24,7 @@ const orderIndependentProps = [
   'queryKey',
   '...objectExpressionSpread',
   '...callExpressionSpread',
+  '...memberCallExpressionSpread',
 ] as const
 type OrderIndependentProps = (typeof orderIndependentProps)[number]
 
@@ -147,6 +148,8 @@ function getCode({
         return `...objectExpressionSpread`
       case '...callExpressionSpread':
         return callExpressionSpread
+      case '...memberCallExpressionSpread':
+        return '...myOptions.infiniteQueryOptions()'
       case 'queryKey':
         return `queryKey: ['projects']`
       case 'queryFn':

packages/eslint-plugin-query/src/rules/infinite-query-property-order/infinite-query-property-order.rule.ts

@@ -56,23 +56,13 @@ export const rule = createRule({
           return
         }
 
-        const properties = allProperties.flatMap((p) => {
+        const properties = allProperties.flatMap((p, index) => {
           if (
             p.type === AST_NODE_TYPES.Property &&
             p.key.type === AST_NODE_TYPES.Identifier
           ) {
             return { name: p.key.name, property: p }
-          } else if (p.type === AST_NODE_TYPES.SpreadElement) {
-            if (p.argument.type === AST_NODE_TYPES.Identifier) {
-              return { name: p.argument.name, property: p }
-            } else if (p.argument.type === AST_NODE_TYPES.CallExpression) {
-              if (p.argument.callee.type === AST_NODE_TYPES.Identifier) {
-                return { name: p.argument.callee.name, property: p }
-              }
-            }
-            throw new Error('Unsupported spread element')
-          }
-          return []
+          } else return { name: `_property_${index}`, property: p }
         })
 
         const sortedProperties = sortDataByOrder(properties, sortRules, 'name')