fix(codemod): remove the function overloads when the second argument is a function expression (#6191)

* fix(codemod): remove the function overloads when the second argument is a function expression

After a quick sync with @TkDodo, it turned out in this case it's safe to do the transformation, because the second argument is a function expression, so it means the first parameter must be the query key.

* fix(codemod): add the `useQuery` hook to the transformation list, because it was missing

* chore(codemod): rename the `parameters` constant to `functionArguments`

The naming was wrong from the beginning. The codemod does transformations with the arguments of the functions, not with their parameters. :)

* chore(codemod): fix the import order

The CI was failing because of it.

---------

Co-authored-by: Dominik Dorfmeister <office@dorfmeister.cc>

Author: balazsmatepetro

packages/codemods/src/v5/remove-overloads/__testfixtures__/default-import.input.tsx

@@ -2,6 +2,7 @@ import * as React from 'react'
 import {
   useIsFetching,
   useIsMutating,
+  useQuery,
   useQueryClient,
 } from '@tanstack/react-query'
 import { queryKeysFromAnotherModule } from '../another/module'
@@ -197,3 +198,13 @@ export const WithIdentifiers = () => {
   queryClient.fetchQuery(queryKeysFromAnotherModule, fetchOptions)
   queryClient.fetchQuery(queryKeysFromAnotherModule, queryFn, fetchOptions)
 }
+
+export const SecondArgumentIsAFunctionExample = () => {
+  useQuery(ordersCacheKeys.groupOrders(ouuid), () => api.getPatientGroupOrders(ouuid).then((r) => r.data))
+
+  const rest = 'rest'
+  const of = 1
+  const functionArguments = { foo: 'bar' }
+
+  useQuery(ordersCacheKeys.groupOrders(ouuid), () => api.getPatientGroupOrders(ouuid).then((r) => r.data), rest, of, functionArguments)
+}

packages/codemods/src/v5/remove-overloads/__testfixtures__/default-import.output.tsx

@@ -2,6 +2,7 @@ import * as React from 'react'
 import {
   useIsFetching,
   useIsMutating,
+  useQuery,
   useQueryClient,
 } from '@tanstack/react-query'
 import { queryKeysFromAnotherModule } from '../another/module'
@@ -482,3 +483,19 @@ export const WithIdentifiers = () => {
   queryClient.fetchQuery(queryKeysFromAnotherModule, fetchOptions)
   queryClient.fetchQuery(queryKeysFromAnotherModule, queryFn, fetchOptions)
 }
+
+export const SecondArgumentIsAFunctionExample = () => {
+  useQuery({
+    queryKey: ordersCacheKeys.groupOrders(ouuid),
+    queryFn: () => api.getPatientGroupOrders(ouuid).then((r) => r.data)
+  })
+
+  const rest = 'rest'
+  const of = 1
+  const functionArguments = { foo: 'bar' }
+
+  useQuery({
+    queryKey: ordersCacheKeys.groupOrders(ouuid),
+    queryFn: () => api.getPatientGroupOrders(ouuid).then((r) => r.data)
+  }, rest, of, functionArguments)
+}

packages/codemods/src/v5/remove-overloads/remove-overloads.js

@@ -27,7 +27,7 @@ module.exports = (file, api) => {
         'resetQueries',
         // 'setQueriesData',
       ],
-      hooks: ['useIsFetching'],
+      hooks: ['useIsFetching', 'useQuery'],
     },
   })
 

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

@@ -94,14 +94,40 @@ const transformFilterAwareUsages = ({
        * it will notify the consumers that they need to rewrite this usage manually.
        */
       if (!keyProperty) {
-        throw new UnknownUsageError(node, filePath)
+        const secondArgument =
+          node.arguments.length > 1 ? node.arguments[1] : null
+
+        if (!secondArgument) {
+          throw new UnknownUsageError(node, filePath)
+        }
+
+        if (utils.isFunctionDefinition(secondArgument)) {
+          const originalArguments = node.arguments
+          const firstArgument = jscodeshift.objectExpression([
+            jscodeshift.property(
+              'init',
+              jscodeshift.identifier('queryKey'),
+              originalArguments[0],
+            ),
+            jscodeshift.property(
+              'init',
+              jscodeshift.identifier('queryFn'),
+              secondArgument,
+            ),
+          ])
+
+          return jscodeshift.callExpression(node.original.callee, [
+            firstArgument,
+            ...originalArguments.slice(2),
+          ])
+        }
       }
 
-      const parameters = [jscodeshift.objectExpression([keyProperty])]
+      const functionArguments = [jscodeshift.objectExpression([keyProperty])]
       const secondParameter = node.arguments[1]
 
       if (secondParameter) {
-        const createdObjectExpression = parameters[0]
+        const createdObjectExpression = functionArguments[0]
 
         /**
          * If it has a second argument, and it's an object expression, then we get the properties from it
@@ -122,10 +148,10 @@ const transformFilterAwareUsages = ({
         }
       }
 
-      // The rest of the parameters can be simply pushed to the parameters object so all will be kept.
-      parameters.push(...node.arguments.slice(2))
+      // The rest of the function arguments can be simply pushed to the function arguments object so all will be kept.
+      functionArguments.push(...node.arguments.slice(2))
 
-      return jscodeshift.callExpression(node.original.callee, parameters)
+      return jscodeshift.callExpression(node.original.callee, functionArguments)
     } catch (error) {
       utils.warn(
         error.name === UnknownUsageError.name