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

package/src/callbacks/fetchInfiniteQuery.ts

@@ -1,19 +1,24 @@
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationFetchInfiniteQuery } from '../service-operation/ServiceOperationFetchInfiniteQuery.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
-import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const fetchInfiniteQuery: <
   TSchema extends { url: string; method: 'get' | 'head' | 'options' },
   TData,
   TParams,
 >(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: TSchema,
   args: Parameters<
-    ServiceOperationQuery<TSchema, TData, TParams>['fetchInfiniteQuery']
+    ServiceOperationFetchInfiniteQuery<
+      TSchema,
+      TData,
+      TParams
+    >['fetchInfiniteQuery']
   >
-) => Promise<TData> = (_, schema, args) => {
+) => Promise<TData> = (qraftOptions, schema, args) => {
   return callQueryClientMethodWithQueryKey(
+    qraftOptions,
     'fetchInfiniteQuery',
     schema,
     true,

package/src/callbacks/fetchQuery.ts

@@ -1,17 +1,20 @@
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationFetchQuery } from '../service-operation/ServiceOperationFetchQuery.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
-import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const fetchQuery: <
   TSchema extends { url: string; method: 'get' | 'head' | 'options' },
   TData,
   TParams,
 >(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: TSchema,
-  args: Parameters<ServiceOperationQuery<TSchema, TData, TParams>['fetchQuery']>
-) => Promise<TData> = (_, schema, args) => {
+  args: Parameters<
+    ServiceOperationFetchQuery<TSchema, TData, TParams>['fetchQuery']
+  >
+) => Promise<TData> = (qraftOptions, schema, args) => {
   return callQueryClientMethodWithQueryKey(
+    qraftOptions,
     'fetchQuery',
     schema,
     false,

package/src/callbacks/getInfiniteQueryData.ts

@@ -1,11 +1,11 @@
 import type { InfiniteData } from '@tanstack/query-core';
 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 { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function getInfiniteQueryData<TData>(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<
@@ -16,9 +16,11 @@ export function getInfiniteQueryData<TData>(
   >
 ): InfiniteData<TData> | undefined {
   return callQueryClientMethodWithQueryKey(
+    qraftOptions,
     'getQueryData',
     schema,
     true,
-    args as never
+    // @ts-expect-error - Too complex to type
+    args
   ) as never;
 }

package/src/callbacks/getInfiniteQueryKey.ts

@@ -1,10 +1,10 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
+import { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
 import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const getInfiniteQueryKey = (
-  qraftOptions: QraftClientOptions | undefined,
+  _qraftOptions: CreateAPIBasicClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<

package/src/callbacks/getInfiniteQueryState.ts

@@ -1,10 +1,10 @@
 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 { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function getInfiniteQueryState<TData>(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<
@@ -15,9 +15,11 @@ export function getInfiniteQueryState<TData>(
   >
 ): TData | undefined {
   return callQueryClientMethodWithQueryKey(
+    qraftOptions,
     'getQueryState',
     schema,
     true,
-    args as never
+    // @ts-expect-error - Too complex to type
+    args
   ) as never;
 }

package/src/callbacks/getMutationKey.ts

@@ -1,10 +1,10 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 import { composeMutationKey } from '../lib/composeMutationKey.js';
-import { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 
 export const getMutationKey = (
-  qraftOptions: QraftClientOptions | undefined,
+  _qraftOptions: CreateAPIBasicClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationMutation<

package/src/callbacks/getQueriesData.ts

@@ -1,16 +1,17 @@
 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 { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
-import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export function getQueriesData<TData>(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<OperationSchema, unknown, TData>['getQueriesData']
   >
 ): TData | undefined {
   return callQueryClientMethodWithQueryFilters(
+    qraftOptions,
     'getQueriesData',
     schema,
     args as never

package/src/callbacks/getQueryData.ts

@@ -1,19 +1,21 @@
 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 { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function getQueryData<TData>(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<OperationSchema, unknown, TData>['getQueryData']
   >
 ): TData | undefined {
   return callQueryClientMethodWithQueryKey(
+    qraftOptions,
     'getQueryData',
     schema,
     false,
-    args as never
+    // @ts-expect-error - Too complex to type
+    args
   ) as never;
 }

package/src/callbacks/getQueryKey.ts

@@ -1,10 +1,10 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
-import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const getQueryKey = (
-  qraftOptions: QraftClientOptions | undefined,
+  _qraftOptions: CreateAPIBasicClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<OperationSchema, unknown, unknown>['getQueryKey']

package/src/callbacks/getQueryState.ts

@@ -1,19 +1,21 @@
 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 { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function getQueryState<TData>(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<OperationSchema, unknown, TData>['getQueryState']
   >
 ): TData | undefined {
   return callQueryClientMethodWithQueryKey(
+    qraftOptions,
     'getQueryState',
     schema,
     false,
-    args as never
+    // @ts-expect-error - Too complex to type
+    args
   ) as never;
 }

package/src/callbacks/index.ts

@@ -4,8 +4,6 @@ export { getMutationKey } from './getMutationKey.js';
 export { getQueryData } from './getQueryData.js';
 export { getQueriesData } from './getQueriesData.js';
 export { getQueryKey } from './getQueryKey.js';
-export { mutationFn } from './mutationFn.js';
-export { queryFn } from './queryFn.js';
 export { setInfiniteQueryData } from './setInfiniteQueryData.js';
 export { setQueryData } from './setQueryData.js';
 export { setQueriesData } from './setQueriesData.js';

package/src/callbacks/invalidateQueries.ts

@@ -1,13 +1,13 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationInvalidateQueriesCallback } from '../service-operation/ServiceOperationInvalidateQueries.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationInvalidateQueries } from '../service-operation/ServiceOperationInvalidateQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function invalidateQueries<TData>(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationInvalidateQueriesCallback<
+    ServiceOperationInvalidateQueries<
       OperationSchema,
       unknown,
       TData
@@ -15,6 +15,7 @@ export function invalidateQueries<TData>(
   >
 ): Promise<void> {
   return callQueryClientMethodWithQueryFilters(
+    qraftOptions,
     'invalidateQueries',
     schema,
     args as never

package/src/callbacks/isFetching.ts

@@ -1,13 +1,13 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationIsFetchingQueriesCallback } from '../service-operation/ServiceOperationIsFetchingQueries.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationIsFetchingQueries } from '../service-operation/ServiceOperationIsFetchingQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function isFetching<TData>(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationIsFetchingQueriesCallback<
+    ServiceOperationIsFetchingQueries<
       OperationSchema,
       unknown,
       TData
@@ -15,6 +15,7 @@ export function isFetching<TData>(
   >
 ): Promise<void> {
   return callQueryClientMethodWithQueryFilters(
+    qraftOptions,
     'isFetching',
     schema,
     args as never

package/src/callbacks/isMutating.ts

@@ -1,13 +1,13 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationIsMutatingQueriesCallback } from '../service-operation/ServiceOperationIsMutatingQueries.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationIsMutatingQueries } from '../service-operation/ServiceOperationIsMutatingQueries.js';
 import { callQueryClientMethodWithMutationFilters } from '../lib/callQueryClientMethodWithMutationFilters.js';
 
 export function isMutating<TData>(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationIsMutatingQueriesCallback<
+    ServiceOperationIsMutatingQueries<
       OperationSchema,
       unknown,
       TData
@@ -15,6 +15,7 @@ export function isMutating<TData>(
   >
 ): Promise<void> {
   return callQueryClientMethodWithMutationFilters(
+    qraftOptions,
     'isMutating',
     schema,
     args as never

package/src/callbacks/operationInvokeFn.ts

@@ -1,7 +1,7 @@
-import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationMutationFn } from '../service-operation/ServiceOperationMutationFn.js';
-import { ServiceOperationQueryFn } from '../service-operation/ServiceOperationQueryFn.js';
+import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationMutationFn } from '../service-operation/ServiceOperationMutationFn.js';
+import type { ServiceOperationQueryFn } from '../service-operation/ServiceOperationQueryFn.js';
+import { OperationSchema, RequestFnResponse } from '../lib/requestFn.js';
 
 /**
  * Called when <service>.<operation>(...) is invoked.
@@ -11,35 +11,45 @@ export const operationInvokeFn: <
   TBody,
   TData,
   TParams,
+  TError,
 >(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIBasicClientOptions,
   schema: TSchema,
   args:
-    | Parameters<ServiceOperationQueryFn<TSchema, TData, TParams>>
-    | Parameters<ServiceOperationMutationFn<TSchema, TBody, TData, TParams>>
-) => Promise<TData> = (_, schema, args) => {
+    | Parameters<ServiceOperationQueryFn<TSchema, TData, TParams, TError>>
+    | Parameters<
+        ServiceOperationMutationFn<TSchema, TBody, TData, TParams, TError>
+      >
+) => Promise<RequestFnResponse<TData, TError>> = (
+  qraftOptions,
+  schema,
+  args
+) => {
   const queryOperationMethods = ['get', 'head', 'options'] as const; // todo::make it shared
 
   const isQueryOperationType = queryOperationMethods.includes(
     schema.method as (typeof queryOperationMethods)[number]
   );
 
-  const [options, client] = args;
+  const [options, requestFn = qraftOptions.requestFn] = args;
 
   const invokeSchema =
-    isQueryOperationType && 'queryKey' in options
+    options && isQueryOperationType && 'queryKey' in options
       ? options.queryKey![0]
       : schema;
 
   const invokeParameters =
-    isQueryOperationType && 'queryKey' in options
+    options && isQueryOperationType && 'queryKey' in options
       ? options.queryKey![1]
-      : 'parameters' in options
+      : options && 'parameters' in options
         ? options.parameters
         : undefined;
 
-  return client(invokeSchema, {
+  const baseUrl = options && 'baseUrl' in options ? options.baseUrl : undefined;
+
+  return requestFn(invokeSchema, {
     ...options,
+    baseUrl: baseUrl ?? qraftOptions.baseUrl,
     parameters: invokeParameters,
   } as never);
 };

package/src/callbacks/prefetchInfiniteQuery.ts

@@ -1,19 +1,24 @@
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationFetchInfiniteQuery } from '../service-operation/ServiceOperationFetchInfiniteQuery.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
-import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const prefetchInfiniteQuery: <
   TSchema extends { url: string; method: 'get' | 'head' | 'options' },
   TData,
   TParams,
 >(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: TSchema,
   args: Parameters<
-    ServiceOperationQuery<TSchema, TData, TParams>['prefetchInfiniteQuery']
+    ServiceOperationFetchInfiniteQuery<
+      TSchema,
+      TData,
+      TParams
+    >['prefetchInfiniteQuery']
   >
-) => Promise<TData> = (_, schema, args) => {
+) => Promise<TData> = (qraftOptions, schema, args) => {
   return callQueryClientMethodWithQueryKey(
+    qraftOptions,
     'prefetchInfiniteQuery',
     schema,
     true,

package/src/callbacks/prefetchQuery.ts

@@ -1,19 +1,20 @@
-import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationFetchQuery } from '../service-operation/ServiceOperationFetchQuery.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
-import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const prefetchQuery: <
   TSchema extends { url: string; method: 'get' | 'head' | 'options' },
   TData,
   TParams,
 >(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: TSchema,
   args: Parameters<
-    ServiceOperationQuery<TSchema, TData, TParams>['prefetchQuery']
+    ServiceOperationFetchQuery<TSchema, TData, TParams>['prefetchQuery']
   >
-) => Promise<TData> = (_, schema, args) => {
+) => Promise<TData> = (qraftOptions, schema, args) => {
   return callQueryClientMethodWithQueryKey(
+    qraftOptions,
     'prefetchQuery',
     schema,
     false,

package/src/callbacks/refetchQueries.ts

@@ -1,13 +1,13 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationRefetchQueriesCallback } from '../service-operation/ServiceOperationRefetchQueries.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationRefetchQueries } from '../service-operation/ServiceOperationRefetchQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function refetchQueries<TData>(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationRefetchQueriesCallback<
+    ServiceOperationRefetchQueries<
       OperationSchema,
       unknown,
       TData
@@ -15,6 +15,7 @@ export function refetchQueries<TData>(
   >
 ): Promise<void> {
   return callQueryClientMethodWithQueryFilters(
+    qraftOptions,
     'refetchQueries',
     schema,
     args as never

package/src/callbacks/removeQueries.ts

@@ -1,13 +1,13 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationRemoveQueriesCallback } from '../service-operation/ServiceOperationRemoveQueries.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationRemoveQueries } from '../service-operation/ServiceOperationRemoveQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function removeQueries<TData>(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationRemoveQueriesCallback<
+    ServiceOperationRemoveQueries<
       OperationSchema,
       unknown,
       TData
@@ -15,6 +15,7 @@ export function removeQueries<TData>(
   >
 ): Promise<void> {
   return callQueryClientMethodWithQueryFilters(
+    qraftOptions,
     'removeQueries',
     schema,
     args as never

package/src/callbacks/resetQueries.ts

@@ -1,13 +1,13 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationResetQueriesCallback } from '../service-operation/ServiceOperationResetQueries.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationResetQueries } from '../service-operation/ServiceOperationResetQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function resetQueries<TData>(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationResetQueriesCallback<
+    ServiceOperationResetQueries<
       OperationSchema,
       unknown,
       TData
@@ -15,6 +15,7 @@ export function resetQueries<TData>(
   >
 ): Promise<void> {
   return callQueryClientMethodWithQueryFilters(
+    qraftOptions,
     'resetQueries',
     schema,
     args as never

package/src/callbacks/setInfiniteQueryData.ts

@@ -1,14 +1,14 @@
+import type { InfiniteData } from '@tanstack/query-core';
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
-import { InfiniteData } from '@tanstack/query-core';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationSetInfiniteQueryData } from '../service-operation/ServiceOperationSetInfiniteQueryData.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function setInfiniteQueryData<TData>(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<
+    ServiceOperationSetInfiniteQueryData<
       OperationSchema,
       unknown,
       TData
@@ -16,9 +16,11 @@ export function setInfiniteQueryData<TData>(
   >
 ): InfiniteData<TData> | undefined {
   return callQueryClientMethodWithQueryKey(
+    qraftOptions,
     'setQueryData',
     schema,
     true,
-    args as never
+    // @ts-expect-error - Too complex to type
+    args
   ) as never;
 }

package/src/callbacks/setQueriesData.ts

@@ -1,13 +1,13 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationSetQueriesDataCallback } from '../service-operation/ServiceOperationSetQueriesData.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationSetQueriesData } from '../service-operation/ServiceOperationSetQueriesData.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function setQueriesData<TData>(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationSetQueriesDataCallback<
+    ServiceOperationSetQueriesData<
       OperationSchema,
       unknown,
       TData
@@ -15,6 +15,7 @@ export function setQueriesData<TData>(
   >
 ): TData | undefined {
   return callQueryClientMethodWithQueryFilters(
+    qraftOptions,
     'setQueriesData',
     schema,
     args as never

package/src/callbacks/setQueryData.ts

@@ -1,13 +1,13 @@
 import type { OperationSchema } from '../lib/requestFn.js';
-import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationSetQueryDataCallback } from '../service-operation/ServiceOperationSetQueryData.js';
+import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationSetQueryData } from '../service-operation/ServiceOperationSetQueryData.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function setQueryData<TData>(
-  _: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationSetQueryDataCallback<
+    ServiceOperationSetQueryData<
       OperationSchema,
       unknown,
       TData
@@ -15,9 +15,11 @@ export function setQueryData<TData>(
   >
 ): TData | undefined {
   return callQueryClientMethodWithQueryKey(
+    qraftOptions,
     'setQueryData',
     schema,
     false,
-    args as never
+    // @ts-expect-error - Too complex to type
+    args
   ) as never;
 }

package/src/callbacks/useInfiniteQuery.ts

@@ -3,7 +3,7 @@
 import type { DefaultError, InfiniteData } from '@tanstack/query-core';
 import type { UseInfiniteQueryResult } 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 { useInfiniteQuery as useInfiniteQueryBase } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
@@ -13,7 +13,7 @@ export const useInfiniteQuery: <
   TError = DefaultError,
   TData = InfiniteData<TQueryFnData>,
 >(
-  qraftOptions: QraftClientOptions | undefined,
+  qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationQuery<OperationSchema, unknown, unknown>['useInfiniteQuery']