@tanstack/react-query 5.8.7 → 5.8.9

package/build/codemods/src/v5/remove-overloads/transformers/filter-aware-usage-transformer.js

@@ -70,6 +70,26 @@ const transformFilterAwareUsages = ({
   const replacer = (path) => {
     const node = path.node
 
+    const isFunctionDefinition = (functionArgument) => {
+      if (utils.isFunctionDefinition(functionArgument)) {
+        return true
+      }
+
+      if (utils.isIdentifier(functionArgument)) {
+        const binding = v5Utils.getBindingFromScope(
+          path,
+          functionArgument.name,
+          filePath,
+        )
+
+        const isVariableDeclarator = jscodeshift.match(binding, {
+          type: jscodeshift.VariableDeclarator.name,
+        })
+
+        return isVariableDeclarator && utils.isFunctionDefinition(binding.init)
+      }
+    }
+
     try {
       // If the given method/function call matches certain criteria, the node doesn't need to be replaced, this step can be skipped.
       if (canSkipReplacement(node, config.keyName)) {
@@ -129,6 +149,43 @@ const transformFilterAwareUsages = ({
       if (secondParameter) {
         const createdObjectExpression = functionArguments[0]
 
+        if (isFunctionDefinition(secondParameter)) {
+          const objectExpression = jscodeshift.objectExpression([
+            jscodeshift.property(
+              'init',
+              jscodeshift.identifier('queryKey'),
+              node.arguments[0],
+            ),
+            jscodeshift.property(
+              'init',
+              jscodeshift.identifier('queryFn'),
+              secondParameter,
+            ),
+          ])
+
+          const thirdArgument = node.arguments[2]
+
+          if (thirdArgument) {
+            // If it's an object expression, we can copy the properties from it to the newly created object expression.
+            if (utils.isObjectExpression(thirdArgument)) {
+              v5Utils.copyPropertiesFromSource(
+                thirdArgument,
+                objectExpression,
+                predicate,
+              )
+            } else {
+              // Otherwise, we simply spread the third argument in the newly created object expression.
+              objectExpression.properties.push(
+                jscodeshift.spreadElement(thirdArgument),
+              )
+            }
+          }
+
+          return jscodeshift.callExpression(node.original.callee, [
+            objectExpression,
+          ])
+        }
+
         /**
          * If it has a second argument, and it's an object expression, then we get the properties from it
          * (except the "queryKey" or "mutationKey" properties), because these arguments will also be moved to the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-query",
-  "version": "5.8.7",
+  "version": "5.8.9",
   "description": "Hooks for managing, caching and syncing asynchronous and remote data in React",
   "author": "tannerlinsley",
   "license": "MIT",

package/src/__tests__/useQueries.test.tsx

@@ -1077,15 +1077,11 @@ describe('useQueries', () => {
       rendered.getByText('data: true first result 1,second result 1'),
     )
 
-    expect(results.length).toBe(5)
+    const length = results.length
 
-    expect(results[3]).toStrictEqual({
-      combined: true,
-      refetch: expect.any(Function),
-      res: 'first result 1,second result 0',
-    })
+    expect([4, 5]).toContain(results.length)
 
-    expect(results[4]).toStrictEqual({
+    expect(results[results.length - 1]).toStrictEqual({
       combined: true,
       refetch: expect.any(Function),
       res: 'first result 1,second result 1',
@@ -1095,6 +1091,6 @@ describe('useQueries', () => {
 
     await sleep(100)
     // no further re-render because data didn't change
-    expect(results.length).toBe(5)
+    expect(results.length).toBe(length)
   })
 })