fix: createInfiniteQuery could not infer correct types

Author: liaoliao666

package.json

@@ -27,7 +27,7 @@
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-node-resolve": "^13.2.1",
     "@rollup/plugin-replace": "^4.0.0",
-    "@tanstack/react-query": "^5.59.16",
+    "@tanstack/react-query": "^5.84.2",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
     "@trivago/prettier-plugin-sort-imports": "^4.2.0",

src/types.ts

@@ -31,16 +31,31 @@ type CompatibleWithV4<V5, V4> =
     ? V5
     : V4
 
+type CompatibleWithTwoV5<V6Generics, V5Generics> = UseInfiniteQueryOptions<
+  unknown,
+  DefaultError,
+  unknown,
+  QueryKey,
+  unknown
+> extends never
+  ? V5Generics
+  : V6Generics
+
 type CompatibleUseInfiniteQueryOptions<TFnData, TData, TError, TPageParam> =
   CompatibleWithV4<
-    UseInfiniteQueryOptions<
-      TFnData,
-      TError,
-      TData,
-      TFnData,
-      QueryKey,
-      TPageParam
+    CompatibleWithTwoV5<
+      UseInfiniteQueryOptions<TFnData, TError, TData, QueryKey, TPageParam>,
+      // @ts-ignore
+      UseInfiniteQueryOptions<
+        TFnData,
+        TError,
+        TData,
+        TFnData,
+        QueryKey,
+        TPageParam
+      >
     >,
+    // @ts-ignore
     UseInfiniteQueryOptions<TFnData, TError, TData, TFnData, QueryKey>
   >
 

yarn.lock

@@ -1676,17 +1676,17 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
-"@tanstack/query-core@5.59.16":
-  version "5.59.16"
-  resolved "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.59.16.tgz#aa4616e8a9c12afeef4cfbf3ed0f55f404d66e67"
-  integrity sha512-crHn+G3ltqb5JG0oUv6q+PMz1m1YkjpASrXTU+sYWW9pLk0t2GybUHNRqYPZWhxgjPaVGC4yp92gSFEJgYEsPw==
+"@tanstack/query-core@5.83.1":
+  version "5.83.1"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.83.1.tgz#eed82970b30cb24536f561613b5630e03d349628"
+  integrity sha512-OG69LQgT7jSp+5pPuCfzltq/+7l2xoweggjme9vlbCPa/d7D7zaqv5vN/S82SzSYZ4EDLTxNO1PWrv49RAS64Q==
 
-"@tanstack/react-query@^5.59.16":
-  version "5.59.16"
-  resolved "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.59.16.tgz#1e701c6e6681965c04aa426df9da54b8edc6db1b"
-  integrity sha512-MuyWheG47h6ERd4PKQ6V8gDyBu3ThNG22e1fRVwvq6ap3EqsFhyuxCAwhNP/03m/mLg+DAb0upgbPaX6VB+CkQ==
+"@tanstack/react-query@^5.84.2":
+  version "5.84.2"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.84.2.tgz#008a8cd26b1e258f87f54cf00cbae14e9c3c84d2"
+  integrity sha512-cZadySzROlD2+o8zIfbD978p0IphuQzRWiiH3I2ugnTmz4jbjc0+TdibpwqxlzynEen8OulgAg+rzdNF37s7XQ==
   dependencies:
-    "@tanstack/query-core" "5.59.16"
+    "@tanstack/query-core" "5.83.1"
 
 "@testing-library/dom@^9.0.0":
   version "9.3.0"