@openapi-qraft/react 1.14.0 → 2.0.0-next.0

package/src/callbacks/useIsFetching.ts

@@ -1,14 +1,13 @@
 'use client';
 
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useIsFetching as useIsFetchingTanstack } from '@tanstack/react-query';
 import { composeQueryFilters } from '../lib/composeQueryFilters.js';
-import { useQueryClient } from '../lib/useQueryClient.js';
 
 export const useIsFetching: <TVariables = unknown>(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<
@@ -19,10 +18,10 @@ export const useIsFetching: <TVariables = unknown>(
     >['useIsFetching']
   >
 ) => number = (qraftOptions, schema, args) => {
-  const [filters, queryClientByArg] = args;
+  const [filters] = args;
 
   return useIsFetchingTanstack(
     composeQueryFilters(schema, filters as never) as never,
-    useQueryClient(qraftOptions, queryClientByArg)
+    qraftOptions.queryClient
   ) as never;
 };

package/src/callbacks/useIsMutating.ts

@@ -1,15 +1,12 @@
 'use client';
 
 import type { DefaultError } from '@tanstack/query-core';
+import type { UseMutationResult } from '@tanstack/react-query';
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import {
-  useIsMutating as useIsMutatingStateTanstack,
-  UseMutationResult,
-} from '@tanstack/react-query';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
+import { useIsMutating as useIsMutatingStateTanstack } from '@tanstack/react-query';
 import { composeMutationFilters } from '../lib/composeMutationFilters.js';
-import { useQueryClient } from '../lib/useQueryClient.js';
-import { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 
 export const useIsMutating: <
   TData = unknown,
@@ -17,7 +14,7 @@ export const useIsMutating: <
   TVariables = unknown,
   TContext = unknown,
 >(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationMutation<
@@ -32,10 +29,10 @@ export const useIsMutating: <
   schema,
   args
 ) => {
-  const [filters, queryClientByArg] = args;
+  const [filters] = args;
 
   return useIsMutatingStateTanstack(
     composeMutationFilters(schema, filters) as never,
-    useQueryClient(qraftOptions, queryClientByArg)
+    qraftOptions.queryClient
   ) as never;
 };

package/src/callbacks/useMutation.ts

@@ -1,18 +1,14 @@
 'use client';
 
 import type { DefaultError } from '@tanstack/query-core';
+import type { UseMutationResult } from '@tanstack/react-query';
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 import type { ServiceOperationMutationKey } from '../service-operation/ServiceOperationKey.js';
-import {
-  useMutation as useMutationBase,
-  UseMutationResult,
-} from '@tanstack/react-query';
-import { useContext } from 'react';
+import { useMutation as useMutationBase } from '@tanstack/react-query';
 import { composeMutationKey } from '../lib/composeMutationKey.js';
-import { useQueryClient } from '../lib/useQueryClient.js';
-import { QraftContext } from '../QraftContext.js';
+import { requestFnResponseResolver } from '../lib/requestFnResponseResolver.js';
 
 export const useMutation: <
   TData = unknown,
@@ -20,7 +16,7 @@ export const useMutation: <
   TVariables = void,
   TContext = unknown,
 >(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationMutation<
@@ -35,7 +31,7 @@ export const useMutation: <
   schema,
   args
 ) => {
-  const [parameters, options, queryClientByArg] = args;
+  const [parameters, options] = args;
 
   if (
     parameters &&
@@ -47,8 +43,6 @@ export const useMutation: <
       `'useMutation': parameters and 'options.mutationKey' cannot be used together`
     );
 
-  const contextValue = useContext(qraftOptions?.context ?? QraftContext);
-
   const mutationKey =
     options && 'mutationKey' in options
       ? (options.mutationKey as ServiceOperationMutationKey<
@@ -61,34 +55,33 @@ export const useMutation: <
     {
       ...options,
       mutationKey,
+      // @ts-expect-error - Too complex to type
       mutationFn:
         options?.mutationFn ??
         (parameters
           ? function (bodyPayload) {
-              if (!contextValue?.requestFn)
-                throw new Error(`QraftContext.requestFn not found`);
-
-              return contextValue.requestFn(schema, {
-                parameters,
-                baseUrl: contextValue.baseUrl,
-                body: bodyPayload as never,
-              });
+              return qraftOptions
+                .requestFn(schema, {
+                  parameters,
+                  baseUrl: qraftOptions.baseUrl,
+                  body: bodyPayload as never,
+                })
+                .then(requestFnResponseResolver, requestFnResponseResolver);
             }
           : function (parametersAndBodyPayload) {
-              if (!contextValue?.requestFn)
-                throw new Error(`QraftContext.requestFn not found`);
-
               const { body, ...parameters } = parametersAndBodyPayload as {
                 body: unknown;
               };
 
-              return contextValue.requestFn(schema, {
-                parameters,
-                baseUrl: contextValue.baseUrl,
-                body,
-              } as never);
+              return qraftOptions
+                .requestFn(schema, {
+                  parameters,
+                  baseUrl: qraftOptions.baseUrl,
+                  body,
+                } as never)
+                .then(requestFnResponseResolver, requestFnResponseResolver);
             }),
     },
-    useQueryClient(qraftOptions, queryClientByArg)
+    qraftOptions.queryClient
   ) as never;
 };

package/src/callbacks/useMutationState.ts

@@ -1,15 +1,12 @@
 'use client';
 
 import type { DefaultError } from '@tanstack/query-core';
+import type { UseMutationResult } from '@tanstack/react-query';
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import {
-  UseMutationResult,
-  useMutationState as useMutationStateTanstack,
-} from '@tanstack/react-query';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
+import { useMutationState as useMutationStateTanstack } from '@tanstack/react-query';
 import { composeMutationFilters } from '../lib/composeMutationFilters.js';
-import { useQueryClient } from '../lib/useQueryClient.js';
-import { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 
 export const useMutationState: <
   TData = unknown,
@@ -17,7 +14,7 @@ export const useMutationState: <
   TVariables = unknown,
   TContext = unknown,
 >(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationMutation<
@@ -32,13 +29,13 @@ export const useMutationState: <
   schema,
   args
 ) => {
-  const [options, queryClientByArg] = args;
+  const [options] = args;
 
   return useMutationStateTanstack(
     {
       ...options,
       filters: composeMutationFilters(schema, options?.filters),
     } as never,
-    useQueryClient(qraftOptions, queryClientByArg)
+    qraftOptions.queryClient
   ) as never;
 };

package/src/callbacks/useQueries.ts

@@ -1,27 +1,21 @@
 'use client';
 
+import type { QueriesResults } from '@tanstack/react-query';
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import {
-  QueriesResults,
-  useQueries as useQueriesTanstack,
-} from '@tanstack/react-query';
-import { useContext } from 'react';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
+import { useQueries as useQueriesTanstack } from '@tanstack/react-query';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
-import { useQueryClient } from '../lib/useQueryClient.js';
-import { QraftContext } from '../QraftContext.js';
-import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
+import { requestFnResponseResolver } from '../lib/requestFnResponseResolver.js';
 
 export const useQueries: (
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<OperationSchema, unknown, unknown>['useQueries']
   >
 ) => QueriesResults<never> = (qraftOptions, schema, args) => {
-  const [options, queryClientByArg] = args;
-
-  const contextValue = useContext(qraftOptions?.context ?? QraftContext);
+  const [options] = args;
 
   return useQueriesTanstack(
     {
@@ -46,19 +40,18 @@ export const useQueries: (
           queryFn:
             optionsWithQueryKey.queryFn ??
             function ({ queryKey: [, queryParams], signal, meta }) {
-              if (!contextValue?.requestFn)
-                throw new Error(`QraftContext.requestFn not found`);
-
-              return contextValue.requestFn(schema, {
-                parameters: queryParams as never,
-                baseUrl: contextValue.baseUrl,
-                signal,
-                meta,
-              });
+              return qraftOptions
+                .requestFn(schema, {
+                  parameters: queryParams as never,
+                  baseUrl: qraftOptions.baseUrl,
+                  signal,
+                  meta,
+                })
+                .then(requestFnResponseResolver, requestFnResponseResolver);
             },
         };
       }),
     },
-    useQueryClient(qraftOptions, queryClientByArg)
+    qraftOptions.queryClient
   ) as never;
 };

package/src/callbacks/useQuery.ts

@@ -3,13 +3,13 @@
 import type { DefaultError } from '@tanstack/query-core';
 import type { UseQueryResult } from '@tanstack/react-query';
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useQuery as useQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 
 export const useQuery: <TData = unknown, TError = DefaultError>(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<OperationSchema, unknown, unknown>['useQuery']

package/src/callbacks/useSuspenseInfiniteQuery.ts

@@ -3,7 +3,7 @@
 import type { DefaultError, InfiniteData } from '@tanstack/query-core';
 import type { UseSuspenseInfiniteQueryResult } from '@tanstack/react-query';
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
@@ -13,7 +13,7 @@ export const useSuspenseInfiniteQuery: <
   TError = DefaultError,
   TData = InfiniteData<TQueryFnData>,
 >(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<

package/src/callbacks/useSuspenseQueries.ts

@@ -1,19 +1,15 @@
 'use client';
 
+import type { SuspenseQueriesResults } from '@tanstack/react-query';
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import {
-  SuspenseQueriesResults,
-  useSuspenseQueries as useSuspenseQueriesTanstack,
-} from '@tanstack/react-query';
-import { useContext } from 'react';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
+import { useSuspenseQueries as useSuspenseQueriesTanstack } from '@tanstack/react-query';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
-import { useQueryClient } from '../lib/useQueryClient.js';
-import { QraftContext } from '../QraftContext.js';
-import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
+import { requestFnResponseResolver } from '../lib/requestFnResponseResolver.js';
 
 export const useSuspenseQueries: (
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<
@@ -23,9 +19,7 @@ export const useSuspenseQueries: (
     >['useSuspenseQueries']
   >
 ) => SuspenseQueriesResults<never> = (qraftOptions, schema, args) => {
-  const [options, queryClientByArg] = args;
-
-  const contextValue = useContext(qraftOptions?.context ?? QraftContext);
+  const [options] = args;
 
   return useSuspenseQueriesTanstack(
     {
@@ -50,19 +44,18 @@ export const useSuspenseQueries: (
           queryFn:
             optionsWithQueryKey.queryFn ??
             function ({ queryKey: [, queryParams], signal, meta }) {
-              if (!contextValue?.requestFn)
-                throw new Error(`QraftContext.requestFn not found`);
-
-              return contextValue.requestFn(schema, {
-                parameters: queryParams as never,
-                baseUrl: contextValue.baseUrl,
-                signal,
-                meta,
-              });
+              return qraftOptions
+                .requestFn(schema, {
+                  parameters: queryParams as never,
+                  baseUrl: qraftOptions.baseUrl,
+                  signal,
+                  meta,
+                })
+                .then(requestFnResponseResolver, requestFnResponseResolver);
             },
         };
       }),
     },
-    useQueryClient(qraftOptions, queryClientByArg)
+    qraftOptions.queryClient
   ) as never;
 };

package/src/callbacks/useSuspenseQuery.ts

@@ -3,7 +3,7 @@
 import type { DefaultError } from '@tanstack/query-core';
 import type { UseQueryResult } from '@tanstack/react-query';
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useSuspenseQuery as useSuspenseQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
@@ -13,7 +13,7 @@ export const useSuspenseQuery: <
   TError = DefaultError,
   TData = TQueryFnData,
 >(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<OperationSchema, unknown, unknown>['useSuspenseQuery']

package/src/index.ts

@@ -1,11 +1,19 @@
-export { qraftAPIClient, type QraftClientOptions } from './qraftAPIClient.js';
-export { QraftContext, type QraftContextValue } from './QraftContext.js';
+export {
+  qraftAPIClient,
+  type CreateAPIClientOptions,
+  type CreateAPIBasicClientOptions,
+  type CreateAPIQueryClientOptions,
+  type APIQueryClientServices,
+  type APIBasicClientServices,
+  type QraftClientOptions,
+} from './qraftAPIClient.js';
 export {
   requestFn,
   baseRequestFn,
   urlSerializer,
   bodySerializer,
   mergeHeaders,
+  type RequestFnResponse,
 } from './lib/requestFn.js';
 
 export type {

package/src/lib/callQueryClientFetchMethod.ts

@@ -1,7 +1,9 @@
 import type { QueryClient } from '@tanstack/query-core';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema, RequestFn } from './requestFn.js';
 import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';
 import { composeQueryKey } from './composeQueryKey.js';
+import { requestFnResponseResolver } from './requestFnResponseResolver.js';
 import { shelfMerge } from './shelfMerge.js';
 
 /**
@@ -11,68 +13,68 @@ import { shelfMerge } from './shelfMerge.js';
 export function callQueryClientMethodWithQueryKey<
   QFMethod extends QueryKeyMethods,
 >(
+  qraftOptions: CreateAPIQueryClientOptions,
   queryFilterMethod: QFMethod,
   schema: OperationSchema,
   infinite: boolean,
   args: QueryClientMethodArgs<QFMethod>
 ): ReturnType<(typeof QueryClient.prototype)[QFMethod]> {
-  const [{ requestFn, baseUrl, parameters, ...options }, queryClient] = args;
+  const {
+    requestFn: requestFnOption,
+    baseUrl: baseUrlOption,
+    queryFn: queryFnOption,
+    parameters,
+    ...options
+  } = args[0] ?? {};
 
-  if (!queryClient) throw new Error('queryClient is required');
-  if (!queryClient[queryFilterMethod])
-    throw new Error(
-      `queryClient is invalid, ${queryFilterMethod} method does not exist`
-    );
+  const queryClient = qraftOptions.queryClient;
+  const baseUrl = baseUrlOption ?? qraftOptions.baseUrl;
 
-  if (options.queryKey && parameters) {
+  if (queryFnOption && requestFnOption) {
     throw new Error(
-      'callQueryClientMethodWithQueryKey: options.queryKey and options.parameters are mutually exclusive'
+      'callQueryClientMethodWithQueryKey: options.queryFn and options.requestFn are mutually exclusive'
     );
   }
 
-  if (options.queryFn && requestFn) {
+  const requestFn = requestFnOption ?? qraftOptions.requestFn;
+
+  if (options.queryKey && parameters) {
     throw new Error(
-      'callQueryClientMethodWithQueryKey: options.queryFn and requestFn are mutually exclusive'
+      'callQueryClientMethodWithQueryKey: options.queryKey and options.parameters are mutually exclusive'
     );
   }
 
   const queryFn =
-    options.queryFn ??
-    (requestFn
-      ? // @ts-expect-error - Not inferring the correct type for `queryFn`
-        function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-          return requestFn(schema, {
-            parameters: infinite
-              ? (shelfMerge(2, queryParams, pageParam) as never)
-              : queryParams,
-            baseUrl,
-            signal,
-            meta,
-          });
-        }
-      : undefined);
-
-  if (parameters) {
+    queryFnOption ??
     // @ts-expect-error - Too complex union to type
-    return queryClient[queryFilterMethod]({
-      ...options,
-      // Event if queryFn is undefined, it will override the default queryFn from `setQueryDefaults(...)`
-      ...(queryFn ? { queryFn } : {}),
-      queryKey: infinite
-        ? composeInfiniteQueryKey(schema, parameters)
-        : composeQueryKey(schema, parameters),
-    });
-  }
+    function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
+      return requestFn(schema, {
+        parameters: infinite
+          ? (shelfMerge(2, queryParams, pageParam) as never)
+          : queryParams,
+        baseUrl,
+        signal,
+        meta,
+      }).then(requestFnResponseResolver, requestFnResponseResolver);
+    };
 
   // @ts-expect-error - Too complex union to type
-  return queryClient[queryFilterMethod]({ ...options, queryFn });
+  return queryClient[queryFilterMethod]({
+    ...options,
+    queryFn,
+    queryKey:
+      options.queryKey ??
+      (infinite
+        ? composeInfiniteQueryKey(schema, parameters)
+        : composeQueryKey(schema, parameters)),
+  });
 }
 
 type QueryClientMethodArgs<QMethod extends keyof QueryClientPrototype> = [
   options: Parameters<QueryClientPrototype[QMethod]>[0] & {
     parameters?: unknown;
     baseUrl?: string;
-    requestFn?: RequestFn<unknown>;
+    requestFn?: RequestFn<unknown, unknown>;
   },
   queryClient: QueryClient,
 ];

package/src/lib/callQueryClientMethodWithMutationFilters.ts

@@ -1,4 +1,5 @@
 import type { QueryClient } from '@tanstack/query-core';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeMutationFilters } from './composeMutationFilters.js';
 
@@ -9,24 +10,19 @@ import { composeMutationFilters } from './composeMutationFilters.js';
 export function callQueryClientMethodWithMutationFilters<
   QFMethod extends QueryFilterMethods,
 >(
+  qraftOptions: CreateAPIQueryClientOptions,
   queryFilterMethod: QFMethod,
   schema: OperationSchema,
   args: [...Parameters<(typeof QueryClient.prototype)[QFMethod]>, QueryClient]
 ): ReturnType<(typeof QueryClient.prototype)[QFMethod]> {
-  const filters = args.length > 1 ? args[0] : undefined;
-  const queryClient = args[args.length - 1] as QueryClient | undefined;
-
-  if (!queryClient) throw new Error('queryClient is required');
-  if (!queryClient[queryFilterMethod])
-    throw new Error(
-      `queryClient is invalid, ${queryFilterMethod} method does not exist`
-    );
+  const filters = args[0];
+  const queryClient = qraftOptions.queryClient;
 
   // @ts-expect-error - Too complex to type
   return queryClient[queryFilterMethod](
     composeMutationFilters(schema, filters as never),
     // @ts-expect-error - Argument types are too complex
-    ...args.slice(1, -1)
+    ...args.slice(1, args.length)
   );
 }
 

package/src/lib/callQueryClientMethodWithQueryFilters.ts

@@ -1,4 +1,5 @@
 import type { QueryClient } from '@tanstack/query-core';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeQueryFilters } from './composeQueryFilters.js';
 
@@ -9,24 +10,19 @@ import { composeQueryFilters } from './composeQueryFilters.js';
 export function callQueryClientMethodWithQueryFilters<
   QFMethod extends QueryFilterMethods,
 >(
+  qraftOptions: CreateAPIQueryClientOptions,
   queryFilterMethod: QFMethod,
   schema: OperationSchema,
   args: [...Parameters<(typeof QueryClient.prototype)[QFMethod]>, QueryClient]
 ): ReturnType<(typeof QueryClient.prototype)[QFMethod]> {
-  const filters = args.length > 1 ? args[0] : undefined;
-  const queryClient = args[args.length - 1] as QueryClient | undefined;
-
-  if (!queryClient) throw new Error('queryClient is required');
-  if (!queryClient[queryFilterMethod])
-    throw new Error(
-      `queryClient is invalid, ${queryFilterMethod} method does not exist`
-    );
+  const filters = args[0];
+  const queryClient = qraftOptions.queryClient;
 
   // @ts-expect-error - Too complex to type
   return queryClient[queryFilterMethod](
     composeQueryFilters(schema, filters as never),
     // @ts-expect-error - Argument types are too complex
-    ...args.slice(1, -1)
+    ...args.slice(1, args.length)
   );
 }
 

package/src/lib/callQueryClientMethodWithQueryKey.ts

@@ -1,4 +1,5 @@
 import type { QueryClient } from '@tanstack/query-core';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';
 import { composeQueryKey } from './composeQueryKey.js';
@@ -10,19 +11,13 @@ import { composeQueryKey } from './composeQueryKey.js';
 export function callQueryClientMethodWithQueryKey<
   QFMethod extends QueryKeyMethods,
 >(
-  queryFilterMethod: QFMethod,
+  qraftOptions: CreateAPIQueryClientOptions,
+  queryClientMethod: QFMethod,
   schema: OperationSchema,
   infinite: boolean,
   args: [...Parameters<(typeof QueryClient.prototype)[QFMethod]>, QueryClient]
 ): ReturnType<(typeof QueryClient.prototype)[QFMethod]> {
-  const parameters = args.length > 1 ? args[0] : undefined;
-  const queryClient = args[args.length - 1] as QueryClient | undefined;
-
-  if (!queryClient) throw new Error('queryClient is required');
-  if (!queryClient[queryFilterMethod])
-    throw new Error(
-      `queryClient is invalid, ${queryFilterMethod} method does not exist`
-    );
+  const parameters = args[0];
 
   const queryKey = Array.isArray(parameters)
     ? parameters
@@ -30,8 +25,13 @@ export function callQueryClientMethodWithQueryKey<
       ? composeInfiniteQueryKey(schema, parameters)
       : composeQueryKey(schema, parameters);
 
+  const queryClient = qraftOptions.queryClient;
+
   // @ts-expect-error - Too complex to type
-  return queryClient[queryFilterMethod](queryKey, ...args.slice(1, -1));
+  return queryClient[queryClientMethod](
+    queryKey,
+    ...args.slice(1, args.length)
+  );
 }
 
 type QueryKeyMethod<QFMethod extends keyof typeof QueryClient.prototype> =