fix: returned option variable of useDefaultOptions is invalid

Author: liaoliao666

README-zh_CN.md

@@ -352,7 +352,7 @@ Returns
 您可以使用 `inferVariables` 或 `inferData` 提取任何自定义 hook 的 TypeScript 类型
 
 ```ts
-import { inferVariables, inferData } from 'react-query-kit'
+import { inferVariables, inferData, inferFnData } from 'react-query-kit'
 
 type Variables = inferVariables<typeof usePost>
 type Data = inferData<typeof usePost>

README.md

@@ -367,7 +367,7 @@ Returns
 You can extract the TypeScript type of any custom hook with `inferVariables` or `inferData`
 
 ```ts
-import { inferVariables, inferData } from 'react-query-kit'
+import { inferVariables, inferData, inferFnData } from 'react-query-kit'
 
 type Variables = inferVariables<typeof usePost>
 type Data = inferData<typeof usePost>

src/createBaseQuery.ts

@@ -40,12 +40,16 @@ export function createBaseQuery(
     variables,
     ...currOptions
   }: QueryBaseHookOptions = {}) => {
-    const { select: _select, ...prevOptions } = {
+    const {
+      select: _select,
+      variables: prevVariables,
+      ...prevOptions
+    } = {
       ...defaultOptions,
       ...useDefaultOptions?.(),
-    }
+    } as QueryBaseHookOptions
 
-    const queryKey = getKey(variables)
+    const queryKey = getKey(variables ?? prevVariables)
 
     const { enabled, ...mergedOptions } = {
       ...prevOptions,
@@ -56,7 +60,6 @@ export function createBaseQuery(
     }
 
     const client = useQueryClient(
-      // @ts-ignore
       mergedOptions.context ? { context: mergedOptions.context } : queryClient
     )