@openapi-qraft/react 1.1.5 → 1.3.2

package/src/callbacks/setInfiniteQueryData.ts

@@ -1,32 +1,25 @@
 import { InfiniteData } from '@tanstack/query-core';
 
-import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
+import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
+import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
-import type {
-  ServiceOperationInfiniteQueryKey,
-  ServiceOperationQuery,
-} from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export function setInfiniteQueryData<TData>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationSchema,
       unknown,
       TData
     >['setInfiniteQueryData']
   >
 ): InfiniteData<TData> | undefined {
-  const [parameters, updater, queryClient, options] = args;
-
-  const queryKey: ServiceOperationInfiniteQueryKey<
-    RequestClientSchema,
-    unknown
-  > = Array.isArray(parameters)
-    ? parameters
-    : composeInfiniteQueryKey(schema, parameters);
-
-  return queryClient.setQueryData(queryKey, updater as never, options);
+  return callQueryClientMethodWithQueryKey(
+    'setQueryData',
+    schema,
+    true,
+    args as never
+  ) as never;
 }

package/src/callbacks/setQueryData.ts

@@ -1,24 +1,23 @@
-import { composeQueryKey } from '../lib/composeQueryKey.js';
+import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
+import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
-import {
-  ServiceOperationQuery,
-  ServiceOperationQueryKey,
-} from '../ServiceOperation.js';
+import type { ServiceOperationSetQueryDataCallback } from '../ServiceOperation.js';
 
 export function setQueryData<TData>(
-  qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  _: QraftClientOptions | undefined,
+  schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<RequestClientSchema, unknown, TData>['setQueryData']
+    ServiceOperationSetQueryDataCallback<
+      OperationSchema,
+      unknown,
+      TData
+    >['setQueryData']
   >
 ): TData | undefined {
-  const [parameters, updater, queryClient, options] = args;
-
-  const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> =
-    Array.isArray(parameters)
-      ? parameters
-      : composeQueryKey(schema, parameters);
-
-  return queryClient.setQueryData(queryKey, updater as never, options);
+  return callQueryClientMethodWithQueryKey(
+    'setQueryData',
+    schema,
+    false,
+    args as never
+  ) as never;
 }

package/src/callbacks/useInfiniteQuery.ts

@@ -1,23 +1,15 @@
 'use client';
 
-import { useContext } from 'react';
-
 import type { DefaultError, InfiniteData } from '@tanstack/query-core';
 import {
   useInfiniteQuery as useInfiniteQueryBase,
-  UseInfiniteQueryResult,
-  useQueryClient,
+  type UseInfiniteQueryResult,
 } from '@tanstack/react-query';
 
-import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
-import { shelfMerge } from '../lib/shelfMerge.js';
+import type { OperationSchema } from '../lib/requestFn.js';
+import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { QraftContext } from '../QraftContext.js';
-import type { RequestClientSchema } from '../RequestClient.js';
-import {
-  ServiceOperationInfiniteQueryKey,
-  ServiceOperationQuery,
-} from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const useInfiniteQuery: <
   TQueryFnData,
@@ -25,43 +17,13 @@ export const useInfiniteQuery: <
   TData = InfiniteData<TQueryFnData>,
 >(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<
-      RequestClientSchema,
-      unknown,
-      unknown
-    >['useInfiniteQuery']
+    ServiceOperationQuery<OperationSchema, unknown, unknown>['useInfiniteQuery']
   >
 ) => UseInfiniteQueryResult<TData, TError> = (qraftOptions, schema, args) => {
-  const [parameters, options, queryClientByArg] = args;
-
-  const { requestClient, queryClient: queryClientByContext } =
-    useContext(qraftOptions?.context ?? QraftContext) ?? {};
-
-  if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
-
-  const queryKey: ServiceOperationInfiniteQueryKey<
-    RequestClientSchema,
-    unknown
-  > = Array.isArray(parameters)
-    ? (parameters as never)
-    : composeInfiniteQueryKey(schema, parameters);
-
   return useInfiniteQueryBase(
-    {
-      ...options,
-      queryKey,
-      queryFn:
-        options?.queryFn ??
-        function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-          return requestClient(schema, {
-            parameters: shelfMerge(2, queryParams, pageParam) as never,
-            signal,
-            meta,
-          });
-        },
-    },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    // @ts-expect-error
+    ...useComposeUseQueryOptions(qraftOptions, schema, args, true)
   ) as never;
 };

package/src/callbacks/useIsFetching.ts

@@ -1,24 +1,19 @@
 'use client';
 
-import { useContext } from 'react';
-
-import {
-  useIsFetching as useIsFetchingTanstack,
-  useQueryClient,
-} from '@tanstack/react-query';
+import { useIsFetching as useIsFetchingTanstack } from '@tanstack/react-query';
 
 import { composeQueryFilters } from '../lib/composeQueryFilters.js';
+import type { OperationSchema } from '../lib/requestFn.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { QraftContext } from '../QraftContext.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import type { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const useIsFetching: <TVariables = unknown>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationSchema,
       object | undefined,
       TVariables,
       unknown
@@ -27,17 +22,8 @@ export const useIsFetching: <TVariables = unknown>(
 ) => number = (qraftOptions, schema, args) => {
   const [filters, queryClientByArg] = args;
 
-  if (filters && 'parameters' in filters && 'mutationKey' in filters) {
-    throw new Error(
-      `'useMutationState': 'parameters' and 'mutationKey' cannot be used together`
-    );
-  }
-
-  const { queryClient: queryClientByContext } =
-    useContext(qraftOptions?.context ?? QraftContext) ?? {};
-
   return useIsFetchingTanstack(
     composeQueryFilters(schema, filters) as never,
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    useQueryClient(qraftOptions, queryClientByArg)
   ) as never;
 };

package/src/callbacks/useMutation.ts

@@ -6,13 +6,13 @@ import type { DefaultError } from '@tanstack/query-core';
 import {
   useMutation as useMutationBase,
   UseMutationResult,
-  useQueryClient,
 } from '@tanstack/react-query';
 
 import { composeMutationKey } from '../lib/composeMutationKey.js';
+import type { OperationSchema } from '../lib/requestFn.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { QraftContext } from '../QraftContext.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import {
   ServiceOperationMutation,
   ServiceOperationMutationKey,
@@ -25,10 +25,10 @@ export const useMutation: <
   TContext = unknown,
 >(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationSchema,
   args: Parameters<
     ServiceOperationMutation<
-      RequestClientSchema,
+      OperationSchema,
       object | undefined,
       TVariables,
       TData
@@ -51,10 +51,9 @@ export const useMutation: <
       `'useMutation': parameters and 'options.mutationKey' cannot be used together`
     );
 
-  const { requestClient, queryClient: queryClientByContext } =
-    useContext(qraftOptions?.context ?? QraftContext) ?? {};
-
-  if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
+  const contextValue = useContext(qraftOptions?.context ?? QraftContext);
+  if (!contextValue?.requestFn)
+    throw new Error(`QraftContext.request not found`);
 
   const mutationKey =
     options && 'mutationKey' in options
@@ -72,8 +71,9 @@ export const useMutation: <
         options?.mutationFn ??
         (parameters
           ? function (bodyPayload) {
-              return requestClient(schema, {
+              return contextValue.requestFn(schema, {
                 parameters,
+                baseUrl: contextValue.baseUrl,
                 body: bodyPayload as never,
               });
             }
@@ -82,12 +82,13 @@ export const useMutation: <
                 body: unknown;
               };
 
-              return requestClient(schema, {
-                body,
+              return contextValue.requestFn(schema, {
                 parameters,
+                baseUrl: contextValue.baseUrl,
+                body,
               } as never);
             }),
     },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    useQueryClient(qraftOptions, queryClientByArg)
   ) as never;
 };

package/src/callbacks/useMutationState.ts

@@ -6,13 +6,12 @@ import type { DefaultError } from '@tanstack/query-core';
 import {
   UseMutationResult,
   useMutationState as useMutationStateTanstack,
-  useQueryClient,
 } from '@tanstack/react-query';
 
 import { composeMutationKey } from '../lib/composeMutationKey.js';
+import type { OperationSchema } from '../lib/requestFn.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { QraftContext } from '../QraftContext.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationMutation } from '../ServiceOperation.js';
 
 export const useMutationState: <
@@ -22,10 +21,10 @@ export const useMutationState: <
   TContext = unknown,
 >(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationSchema,
   args: Parameters<
     ServiceOperationMutation<
-      RequestClientSchema,
+      OperationSchema,
       object | undefined,
       TVariables,
       TData
@@ -48,11 +47,6 @@ export const useMutationState: <
     );
   }
 
-  const { requestClient, queryClient: queryClientByContext } =
-    useContext(qraftOptions?.context ?? QraftContext) ?? {};
-
-  if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
-
   const filters = options?.filters;
 
   return useMutationStateTanstack(
@@ -71,6 +65,6 @@ export const useMutationState: <
               ),
             },
     } as never,
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    useQueryClient(qraftOptions, queryClientByArg)
   ) as never;
 };

package/src/callbacks/useQueries.ts

@@ -5,28 +5,27 @@ import { useContext } from 'react';
 import {
   QueriesResults,
   useQueries as useQueriesTanstack,
-  useQueryClient,
 } from '@tanstack/react-query';
 
 import { composeQueryKey } from '../lib/composeQueryKey.js';
+import type { OperationSchema } from '../lib/requestFn.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { QraftContext } from '../QraftContext.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const useQueries: (
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useQueries']
+    ServiceOperationQuery<OperationSchema, unknown, unknown>['useQueries']
   >
 ) => QueriesResults<never> = (qraftOptions, schema, args) => {
   const [options, queryClientByArg] = args;
 
-  const { requestClient, queryClient: queryClientByContext } =
-    useContext(qraftOptions?.context ?? QraftContext) ?? {};
-
-  if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
+  const contextValue = useContext(qraftOptions?.context ?? QraftContext);
+  if (!contextValue?.requestFn)
+    throw new Error(`QraftContext.requestFn not found`);
 
   return useQueriesTanstack(
     {
@@ -41,6 +40,7 @@ export const useQueries: (
                   },
                   queryOptions
                 );
+                // @ts-expect-error
                 delete queryOptionsCopy.parameters;
                 return queryOptionsCopy;
               })()
@@ -51,8 +51,9 @@ export const useQueries: (
           queryFn:
             optionsWithQueryKey.queryFn ??
             function ({ queryKey: [, queryParams], signal, meta }) {
-              return requestClient(schema, {
+              return contextValue.requestFn(schema, {
                 parameters: queryParams as never,
+                baseUrl: contextValue.baseUrl,
                 signal,
                 meta,
               });
@@ -60,6 +61,6 @@ export const useQueries: (
         };
       }),
     },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    useQueryClient(qraftOptions, queryClientByArg)
   ) as never;
 };

package/src/callbacks/useQuery.ts

@@ -1,56 +1,25 @@
 'use client';
 
-import { useContext } from 'react';
-
 import type { DefaultError } from '@tanstack/query-core';
 import {
   useQuery as useQueryTanstack,
-  useQueryClient,
-  UseQueryResult,
+  type UseQueryResult,
 } from '@tanstack/react-query';
 
-import { composeQueryKey } from '../lib/composeQueryKey.js';
+import type { OperationSchema } from '../lib/requestFn.js';
+import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { QraftContext } from '../QraftContext.js';
-import type { RequestClientSchema } from '../RequestClient.js';
-import {
-  ServiceOperationQuery,
-  ServiceOperationQueryKey,
-} from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const useQuery: <TData = unknown, TError = DefaultError>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useQuery']
+    ServiceOperationQuery<OperationSchema, unknown, unknown>['useQuery']
   >
 ) => UseQueryResult<TData, TError> = (qraftOptions, schema, args) => {
-  const [parameters, options, queryClientByArg] = args;
-
-  const { requestClient, queryClient: queryClientByContext } =
-    useContext(qraftOptions?.context ?? QraftContext) ?? {};
-
-  if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
-
-  const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> =
-    Array.isArray(parameters)
-      ? (parameters as ServiceOperationQueryKey<RequestClientSchema, unknown>)
-      : composeQueryKey(schema, parameters);
-
   return useQueryTanstack(
-    {
-      ...options,
-      queryKey,
-      queryFn:
-        options?.queryFn ??
-        function ({ queryKey: [, queryParams], signal, meta }) {
-          return requestClient(schema, {
-            parameters: queryParams as never,
-            signal,
-            meta,
-          });
-        },
-    },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    // @ts-expect-error
+    ...useComposeUseQueryOptions(qraftOptions, schema, args, false)
   ) as never;
 };

package/src/callbacks/useSuspenseInfiniteQuery.ts

@@ -1,23 +1,15 @@
 'use client';
 
-import { useContext } from 'react';
-
 import type { DefaultError, InfiniteData } from '@tanstack/query-core';
 import {
-  useQueryClient,
   useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack,
-  UseSuspenseInfiniteQueryResult,
+  type UseSuspenseInfiniteQueryResult,
 } from '@tanstack/react-query';
 
-import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
-import { shelfMerge } from '../lib/shelfMerge.js';
+import type { OperationSchema } from '../lib/requestFn.js';
+import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { QraftContext } from '../QraftContext.js';
-import type { RequestClientSchema } from '../RequestClient.js';
-import {
-  ServiceOperationInfiniteQueryKey,
-  ServiceOperationQuery,
-} from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const useSuspenseInfiniteQuery: <
   TQueryFnData,
@@ -25,10 +17,10 @@ export const useSuspenseInfiniteQuery: <
   TData = InfiniteData<TQueryFnData>,
 >(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationSchema,
       unknown,
       unknown
     >['useSuspenseInfiniteQuery']
@@ -38,34 +30,8 @@ export const useSuspenseInfiniteQuery: <
   schema,
   args
 ) => {
-  const [parameters, options, queryClientByArg] = args;
-
-  const { requestClient, queryClient: queryClientByContext } =
-    useContext(qraftOptions?.context ?? QraftContext) ?? {};
-
-  if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
-
-  const queryKey: ServiceOperationInfiniteQueryKey<
-    RequestClientSchema,
-    unknown
-  > = Array.isArray(parameters)
-    ? (parameters as never)
-    : composeInfiniteQueryKey(schema, parameters);
-
   return useSuspenseInfiniteQueryTanstack(
-    {
-      ...options,
-      queryKey,
-      queryFn:
-        options?.queryFn ??
-        function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-          return requestClient(schema, {
-            parameters: shelfMerge(2, queryParams, pageParam) as never,
-            signal,
-            meta,
-          });
-        },
-    },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    // @ts-expect-error
+    ...useComposeUseQueryOptions(qraftOptions, schema, args, true)
   ) as never;
 };

package/src/callbacks/useSuspenseQueries.ts

@@ -4,22 +4,22 @@ import { useContext } from 'react';
 
 import {
   SuspenseQueriesResults,
-  useQueryClient,
   useSuspenseQueries as useSuspenseQueriesTanstack,
 } from '@tanstack/react-query';
 
 import { composeQueryKey } from '../lib/composeQueryKey.js';
+import type { OperationSchema } from '../lib/requestFn.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { QraftContext } from '../QraftContext.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const useSuspenseQueries: (
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationSchema,
       unknown,
       unknown
     >['useSuspenseQueries']
@@ -27,10 +27,9 @@ export const useSuspenseQueries: (
 ) => SuspenseQueriesResults<never> = (qraftOptions, schema, args) => {
   const [options, queryClientByArg] = args;
 
-  const { requestClient, queryClient: queryClientByContext } =
-    useContext(qraftOptions?.context ?? QraftContext) ?? {};
-
-  if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
+  const contextValue = useContext(qraftOptions?.context ?? QraftContext);
+  if (!contextValue?.requestFn)
+    throw new Error(`QraftContext.requestFn not found`);
 
   return useSuspenseQueriesTanstack(
     {
@@ -45,6 +44,7 @@ export const useSuspenseQueries: (
                   },
                   queryOptions
                 );
+                // @ts-expect-error
                 delete queryOptionsCopy.parameters;
                 return queryOptionsCopy;
               })()
@@ -55,8 +55,9 @@ export const useSuspenseQueries: (
           queryFn:
             optionsWithQueryKey.queryFn ??
             function ({ queryKey: [, queryParams], signal, meta }) {
-              return requestClient(schema, {
+              return contextValue.requestFn(schema, {
                 parameters: queryParams as never,
+                baseUrl: contextValue.baseUrl,
                 signal,
                 meta,
               });
@@ -64,6 +65,6 @@ export const useSuspenseQueries: (
         };
       }),
     },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    useQueryClient(qraftOptions, queryClientByArg)
   ) as never;
 };

package/src/callbacks/useSuspenseQuery.ts

@@ -1,22 +1,15 @@
 'use client';
 
-import { useContext } from 'react';
-
 import type { DefaultError } from '@tanstack/query-core';
 import {
-  useQueryClient,
-  UseQueryResult,
+  type UseQueryResult,
   useSuspenseQuery as useSuspenseQueryTanstack,
 } from '@tanstack/react-query';
 
-import { composeQueryKey } from '../lib/composeQueryKey.js';
+import type { OperationSchema } from '../lib/requestFn.js';
+import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { QraftContext } from '../QraftContext.js';
-import type { RequestClientSchema } from '../RequestClient.js';
-import {
-  ServiceOperationQuery,
-  ServiceOperationQueryKey,
-} from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const useSuspenseQuery: <
   TQueryFnData = unknown,
@@ -24,41 +17,13 @@ export const useSuspenseQuery: <
   TData = TQueryFnData,
 >(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<
-      RequestClientSchema,
-      unknown,
-      unknown
-    >['useSuspenseQuery']
+    ServiceOperationQuery<OperationSchema, unknown, unknown>['useSuspenseQuery']
   >
 ) => UseQueryResult<TData, TError> = (qraftOptions, schema, args) => {
-  const [parameters, options, queryClientByArg] = args;
-
-  const { requestClient, queryClient: queryClientByContext } =
-    useContext(qraftOptions?.context ?? QraftContext) ?? {};
-
-  if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
-
-  const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> =
-    Array.isArray(parameters)
-      ? (parameters as never)
-      : composeQueryKey(schema, parameters);
-
   return useSuspenseQueryTanstack(
-    {
-      ...options,
-      queryKey,
-      queryFn:
-        options?.queryFn ??
-        function ({ queryKey: [, queryParams], signal, meta }) {
-          return requestClient(schema, {
-            parameters: queryParams as never,
-            signal,
-            meta,
-          });
-        },
-    },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    // @ts-expect-error
+    ...useComposeUseQueryOptions(qraftOptions, schema, args, false)
   ) as never;
 };