@openapi-qraft/react 1.1.4 → 1.2.0

package/dist/qraftAPIClient.d.ts

@@ -1,14 +1,14 @@
-import { Context } from 'react';
-import { QraftContextValue } from './QraftContext.js';
-import type { RequestClientSchema } from './RequestClient.js';
-export type QraftClientOptions = {
+import type { Context } from 'react';
+import type { OperationRequestSchema } from './lib/request.js';
+import type { QraftContextValue } from './QraftContext.js';
+export interface QraftClientOptions {
     context?: Context<QraftContextValue>;
-};
+}
 export declare const qraftAPIClient: <Services extends ServicesOutput<Services>, Callbacks extends ServicesCallbacks>(services: ServicesDeclaration<Services>, callbacks: Callbacks, options?: QraftClientOptions) => ServicesCallbacksFilter<Services, keyof Callbacks>;
 type ServicesOutput<Services> = {
     [service in keyof Services]: {
         [method in keyof Services[service]]: {
-            schema: RequestClientSchema;
+            schema: OperationRequestSchema;
         };
     };
 };
@@ -23,7 +23,7 @@ type ServicesCallbacks = Record<string, (...rest: any[]) => any>;
 type ServicesCallbacksFilter<Services extends ServicesOutput<Services>, Callbacks> = Services extends {
     [serviceName in keyof Services]: {
         [method in keyof Services[serviceName]]: {
-            schema: RequestClientSchema;
+            schema: OperationRequestSchema;
         };
     };
 } ? {

package/dist/qraftAPIClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qraftAPIClient.d.ts","sourceRoot":"","sources":["../src/qraftAPIClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,cAAc,4JAMf,kBAAkB,uDAgC7B,CAAC;AAeF,KAAK,cAAc,CAAC,QAAQ,IAAI;KAC7B,OAAO,IAAI,MAAM,QAAQ,GAAG;SAC1B,MAAM,IAAI,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG;YAAE,MAAM,EAAE,mBAAmB,CAAA;SAAE;KACrE;CACF,CAAC;AAEF,KAAK,mBAAmB,CAAC,QAAQ,SAAS,cAAc,CAAC,QAAQ,CAAC,IAAI;KACnE,OAAO,IAAI,MAAM,QAAQ,GAAG;SAC1B,MAAM,IAAI,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG;YACnC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC7C;KACF;CACF,CAAC;AAEF,KAAK,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC;AAEjE,KAAK,uBAAuB,CAC1B,QAAQ,SAAS,cAAc,CAAC,QAAQ,CAAC,EACzC,SAAS,IACP,QAAQ,SAAS;KAClB,WAAW,IAAI,MAAM,QAAQ,GAAG;SAC9B,MAAM,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG;YAAE,MAAM,EAAE,mBAAmB,CAAA;SAAE;KACzE;CACF,GACG;KACG,WAAW,IAAI,MAAM,QAAQ,GAAG;SAC9B,MAAM,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAC3C,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EAC7B,UAAU,CACR,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EACnC,SAAS,GAAG,QAAQ,GAAG,OAAO,CAC/B,CACF;KACF;CACF,GACD,KAAK,CAAC;AAEV,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}
+{"version":3,"file":"qraftAPIClient.d.ts","sourceRoot":"","sources":["../src/qraftAPIClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGrC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACtC;AAED,eAAO,MAAM,cAAc,4JAMf,kBAAkB,uDAgC7B,CAAC;AAeF,KAAK,cAAc,CAAC,QAAQ,IAAI;KAC7B,OAAO,IAAI,MAAM,QAAQ,GAAG;SAC1B,MAAM,IAAI,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG;YAAE,MAAM,EAAE,sBAAsB,CAAA;SAAE;KACxE;CACF,CAAC;AAEF,KAAK,mBAAmB,CAAC,QAAQ,SAAS,cAAc,CAAC,QAAQ,CAAC,IAAI;KACnE,OAAO,IAAI,MAAM,QAAQ,GAAG;SAC1B,MAAM,IAAI,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG;YACnC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC7C;KACF;CACF,CAAC;AAEF,KAAK,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC;AAEjE,KAAK,uBAAuB,CAC1B,QAAQ,SAAS,cAAc,CAAC,QAAQ,CAAC,EACzC,SAAS,IACP,QAAQ,SAAS;KAClB,WAAW,IAAI,MAAM,QAAQ,GAAG;SAC9B,MAAM,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG;YAAE,MAAM,EAAE,sBAAsB,CAAA;SAAE;KAC5E;CACF,GACG;KACG,WAAW,IAAI,MAAM,QAAQ,GAAG;SAC9B,MAAM,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAC3C,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EAC7B,UAAU,CACR,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EACnC,SAAS,GAAG,QAAQ,GAAG,OAAO,CAC/B,CACF;KACF;CACF,GACD,KAAK,CAAC;AAEV,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/react",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "API client for React, providing type-safe requests and dynamic Tanstack Query React Hooks via a modular, Proxy-based architecture.",
   "scripts": {
     "build": "rimraf dist/ && tsc --project tsconfig.build.json",
@@ -8,13 +8,13 @@
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
     "typecheck": "tsc --noEmit",
-    "generate-qraft": "openapi-qraft src/tests/fixtures/openapi.json --clean -o src/tests/fixtures/api --openapi-types-import-path '../../openapi.js' --explicit-import-extensions && prettier --write src/tests/fixtures/api/**/*.ts",
+    "generate-qraft": "openapi-qraft src/tests/fixtures/openapi.json --clean -o src/tests/fixtures/api --openapi-types-import-path '../../openapi.js' --explicit-import-extensions --filter-services '/approval_policies/**,/entities/**,/files/**,!/internal/**' && prettier --write src/tests/fixtures/api/**/*.ts",
     "generate-types": "openapi-qraft-typescript src/tests/fixtures/openapi.json -o src/tests/fixtures/openapi.ts"
   },
   "type": "module",
   "sideEffects": false,
   "devDependencies": {
-    "@openapi-qraft/cli": "~1.1.4",
+    "@openapi-qraft/cli": "~1.2.0",
     "@openapi-qraft/openapi-typescript": "^1.0.0",
     "@tanstack/react-query": "^5.17.3",
     "@testing-library/jest-dom": "^5.17.0",

package/src/QraftContext.ts

@@ -4,15 +4,30 @@ import { createContext } from 'react';
 
 import type { QueryClient } from '@tanstack/react-query';
 
-import type { RequestClient } from './RequestClient.js';
+import type {
+  OperationRequestInfo,
+  OperationRequestSchema,
+} from './lib/request.js';
 
-export type QraftContextValue =
-  | {
-      /** The request client to use for making requests. Will be invoked with every request. */
-      requestClient: RequestClient;
-      /** The QueryClient to use in Hooks */
-      queryClient?: QueryClient;
-    }
-  | undefined;
+interface QraftContextValueBase {
+  /** The QueryClient to use in Hooks */
+  queryClient?: QueryClient;
+
+  /**
+   * The request client to use for making requests. Will be invoked with every request.
+   */
+  request<T>(
+    options: { baseUrl: string },
+    schema: OperationRequestSchema,
+    requestInfo: OperationRequestInfo
+  ): Promise<T>;
+  /**
+   * The base URL to use for all requests.
+   * @example 'https://api.example.com'
+   */
+  baseUrl: string;
+}
+
+export type QraftContextValue = QraftContextValueBase | undefined;
 
 export const QraftContext = createContext<QraftContextValue>(undefined);

package/src/RequestClient.ts

@@ -1,32 +1,11 @@
-export type RequestClient = <T>(
-  schema: RequestClientSchema,
-  options: RequestClientOptions
-) => Promise<T>;
-
-export type RequestClientSchema = {
-  url: string;
-  method:
-    | 'get'
-    | 'put'
-    | 'post'
-    | 'patch'
-    | 'delete'
-    | 'options'
-    | 'head'
-    | 'trace';
-  mediaType?: string;
-};
+import type {
+  OperationRequestInfo,
+  OperationRequestSchema,
+  RequestOptions,
+} from './lib/request.js';
 
-export type RequestClientOptions = {
-  body?: BodyInit | Record<string, unknown> | null;
-  parameters?: RequestClientParams;
-  signal?: AbortSignal;
-  meta?: Record<string, unknown>;
-};
-
-export type RequestClientParams = {
-  header?: Record<string, any>;
-  path?: Record<string, any>;
-  query?: Record<string, any>;
-  cookie?: Record<string, any>;
-};
+export type RequestClient<T> = (
+  options: RequestOptions,
+  requestSchema: OperationRequestSchema,
+  requestInfo: OperationRequestInfo
+) => Promise<T>;

package/src/ServiceOperation.ts

@@ -12,6 +12,7 @@ import {
   QueriesPlaceholderDataFunction,
   Query,
   QueryClient,
+  RefetchOptions,
   ResetOptions,
   SetDataOptions,
   Updater,
@@ -60,6 +61,7 @@ export interface ServiceOperationQuery<
     ServiceOperationUseInfiniteQuery<TSchema, TData, TParams, TError>,
     ServiceOperationUseSuspenseQueryQuery<TSchema, TData, TParams, TError>,
     ServiceOperationUseSuspenseInfiniteQuery<TSchema, TData, TParams, TError>,
+    ServiceOperationUseIsFetchingQueries<TSchema, TData, TParams, TError>,
     ServiceOperationQueryFn<TSchema, TData, TParams>,
     ServiceOperationGetQueryData<TSchema, TData, TParams>,
     ServiceOperationGetInfiniteQueryData<TSchema, TData, TParams>,
@@ -67,7 +69,9 @@ export interface ServiceOperationQuery<
     ServiceOperationSetInfiniteQueryData<TSchema, TData, TParams>,
     ServiceOperationInvalidateQueries<TSchema, TData, TParams, TError>,
     ServiceOperationCancelQueries<TSchema, TData, TParams, TError>,
-    ServiceOperationResetQueries<TSchema, TData, TParams, TError> {
+    ServiceOperationResetQueries<TSchema, TData, TParams, TError>,
+    ServiceOperationRefetchQueries<TSchema, TData, TParams, TError>,
+    ServiceOperationIsFetchingQueries<TSchema, TData, TParams, TError> {
   schema: TSchema;
   types: {
     parameters: TParams;
@@ -339,6 +343,94 @@ export interface ServiceOperationResetQueriesCallback<
   ): Promise<void>;
 }
 
+interface ServiceOperationRefetchQueries<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> {
+  refetchQueries(
+    filters:
+      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+    options: RefetchOptions,
+    queryClient: QueryClient
+  ): Promise<void>;
+  refetchQueries(
+    filters:
+      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+    queryClient: QueryClient
+  ): Promise<void>;
+  refetchQueries(queryClient: QueryClient): Promise<void>;
+}
+
+/**
+ * @internal
+ */
+export interface ServiceOperationResetQueriesCallback<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> extends ServiceOperationRefetchQueries<TSchema, TData, TParams, TError> {
+  refetchQueries(
+    filters:
+      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+      | QueryClient,
+    options?: RefetchOptions | QueryClient,
+    queryClient?: QueryClient
+  ): Promise<void>;
+}
+
+interface ServiceOperationIsFetchingQueries<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> {
+  isFetching(
+    filters:
+      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+    queryClient: QueryClient
+  ): number;
+  isFetching(queryClient: QueryClient): number;
+}
+
+/**
+ * @internal
+ */
+export interface ServiceOperationIsFetchingQueriesCallback<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> extends ServiceOperationIsFetchingQueries<TSchema, TData, TParams, TError> {
+  refetchQueries(
+    filters:
+      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+      | QueryClient,
+    queryClient?: QueryClient
+  ): number;
+}
+
+interface ServiceOperationUseIsFetchingQueries<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> {
+  useIsFetching(
+    filters?:
+      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+    queryClient?: QueryClient
+  ): number;
+}
+
 interface ServiceOperationUseSuspenseQueries<
   TSchema extends { url: string; method: string },
   TData,

package/src/callbacks/cancelQueries.ts

@@ -1,14 +1,14 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationCancelQueriesCallback } from '../ServiceOperation.js';
 
 export function cancelQueries<TData>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
     ServiceOperationCancelQueriesCallback<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       TData
     >['cancelQueries']

package/src/callbacks/getInfiniteQueryData.ts

@@ -1,8 +1,8 @@
 import { InfiniteData } from '@tanstack/query-core';
 
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import {
   ServiceOperationInfiniteQueryKey,
   ServiceOperationQuery,
@@ -10,10 +10,10 @@ import {
 
 export function getInfiniteQueryData<TData>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       TData
     >['getInfiniteQueryData']

package/src/callbacks/getInfiniteQueryKey.ts

@@ -1,14 +1,14 @@
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const getInfiniteQueryKey = (
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       unknown
     >['getInfiniteQueryKey']

package/src/callbacks/getMutationKey.ts

@@ -1,14 +1,14 @@
 import { composeMutationKey } from '../lib/composeMutationKey.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationMutation } from '../ServiceOperation.js';
 
 export const getMutationKey = (
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
     ServiceOperationMutation<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       unknown,
       unknown

package/src/callbacks/getQueryData.ts

@@ -1,13 +1,17 @@
 import { composeQueryKey } from '../lib/composeQueryKey.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export function getQueryData<TData>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
-    ServiceOperationQuery<RequestClientSchema, unknown, TData>['getQueryData']
+    ServiceOperationQuery<
+      OperationRequestSchema,
+      unknown,
+      TData
+    >['getQueryData']
   >
 ): TData | undefined {
   const [parameters, queryClient] = args;

package/src/callbacks/getQueryKey.ts

@@ -1,13 +1,17 @@
 import { composeQueryKey } from '../lib/composeQueryKey.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const getQueryKey = (
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
-    ServiceOperationQuery<RequestClientSchema, unknown, unknown>['getQueryKey']
+    ServiceOperationQuery<
+      OperationRequestSchema,
+      unknown,
+      unknown
+    >['getQueryKey']
   >
 ) => {
   return composeQueryKey(schema, args[0]);

package/src/callbacks/invalidateQueries.ts

@@ -1,14 +1,14 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import type { ServiceOperationInvalidateQueriesCallback } from '../ServiceOperation.js';
 
 export function invalidateQueries<TData>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
     ServiceOperationInvalidateQueriesCallback<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       TData
     >['invalidateQueries']

package/src/callbacks/isFetching.ts

@@ -0,0 +1,22 @@
+import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
+import type { OperationRequestSchema } from '../lib/request.js';
+import type { QraftClientOptions } from '../qraftAPIClient.js';
+import { ServiceOperationIsFetchingQueriesCallback } from '../ServiceOperation.js';
+
+export function isFetching<TData>(
+  qraftOptions: QraftClientOptions | undefined,
+  schema: OperationRequestSchema,
+  args: Parameters<
+    ServiceOperationIsFetchingQueriesCallback<
+      OperationRequestSchema,
+      unknown,
+      TData
+    >['isFetching']
+  >
+): Promise<void> {
+  return callQueryClientMethodWithQueryFilters(
+    'isFetching',
+    schema,
+    args as never
+  ) as never;
+}

package/src/callbacks/mutationFn.ts

@@ -1,15 +1,15 @@
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationMutation } from '../ServiceOperation.js';
 
 export const mutationFn = (
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: unknown
 ) => {
   const [client, options] = args as Parameters<
     ServiceOperationMutation<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       unknown,
       never

package/src/callbacks/refetchQueries.ts

@@ -0,0 +1,22 @@
+import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
+import type { OperationRequestSchema } from '../lib/request.js';
+import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationResetQueriesCallback } from '../ServiceOperation.js';
+
+export function refetchQueries<TData>(
+  qraftOptions: QraftClientOptions | undefined,
+  schema: OperationRequestSchema,
+  args: Parameters<
+    ServiceOperationResetQueriesCallback<
+      OperationRequestSchema,
+      unknown,
+      TData
+    >['refetchQueries']
+  >
+): Promise<void> {
+  return callQueryClientMethodWithQueryFilters(
+    'refetchQueries',
+    schema,
+    args as never
+  ) as never;
+}

package/src/callbacks/resetQueries.ts

@@ -1,14 +1,14 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import type { ServiceOperationResetQueriesCallback } from '../ServiceOperation.js';
 
 export function resetQueries<TData>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
     ServiceOperationResetQueriesCallback<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       TData
     >['resetQueries']

package/src/callbacks/setInfiniteQueryData.ts

@@ -1,8 +1,8 @@
 import { InfiniteData } from '@tanstack/query-core';
 
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import type {
   ServiceOperationInfiniteQueryKey,
   ServiceOperationQuery,
@@ -10,10 +10,10 @@ import type {
 
 export function setInfiniteQueryData<TData>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       TData
     >['setInfiniteQueryData']
@@ -22,7 +22,7 @@ export function setInfiniteQueryData<TData>(
   const [parameters, updater, queryClient, options] = args;
 
   const queryKey: ServiceOperationInfiniteQueryKey<
-    RequestClientSchema,
+    OperationRequestSchema,
     unknown
   > = Array.isArray(parameters)
     ? parameters

package/src/callbacks/setQueryData.ts

@@ -1,6 +1,6 @@
 import { composeQueryKey } from '../lib/composeQueryKey.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import {
   ServiceOperationQuery,
   ServiceOperationQueryKey,
@@ -8,14 +8,18 @@ import {
 
 export function setQueryData<TData>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
-    ServiceOperationQuery<RequestClientSchema, unknown, TData>['setQueryData']
+    ServiceOperationQuery<
+      OperationRequestSchema,
+      unknown,
+      TData
+    >['setQueryData']
   >
 ): TData | undefined {
   const [parameters, updater, queryClient, options] = args;
 
-  const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> =
+  const queryKey: ServiceOperationQueryKey<OperationRequestSchema, unknown> =
     Array.isArray(parameters)
       ? parameters
       : composeQueryKey(schema, parameters);

package/src/callbacks/useInfiniteQuery.ts

@@ -6,14 +6,14 @@ import type { DefaultError, InfiniteData } from '@tanstack/query-core';
 import {
   useInfiniteQuery as useInfiniteQueryBase,
   UseInfiniteQueryResult,
-  useQueryClient,
 } from '@tanstack/react-query';
 
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
+import type { OperationRequestSchema } from '../lib/request.js';
 import { shelfMerge } from '../lib/shelfMerge.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 {
   ServiceOperationInfiniteQueryKey,
   ServiceOperationQuery,
@@ -25,10 +25,10 @@ export const useInfiniteQuery: <
   TData = InfiniteData<TQueryFnData>,
 >(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       unknown
     >['useInfiniteQuery']
@@ -36,13 +36,11 @@ export const 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 contextValue = useContext(qraftOptions?.context ?? QraftContext);
+  if (!contextValue?.request) throw new Error(`QraftContext.request not found`);
 
   const queryKey: ServiceOperationInfiniteQueryKey<
-    RequestClientSchema,
+    OperationRequestSchema,
     unknown
   > = Array.isArray(parameters)
     ? (parameters as never)
@@ -55,13 +53,17 @@ export const useInfiniteQuery: <
       queryFn:
         options?.queryFn ??
         function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-          return requestClient(schema, {
-            parameters: shelfMerge(2, queryParams, pageParam) as never,
-            signal,
-            meta,
-          });
+          return contextValue.request(
+            { baseUrl: contextValue.baseUrl },
+            schema,
+            {
+              parameters: shelfMerge(2, queryParams, pageParam) as never,
+              signal,
+              meta,
+            }
+          );
         },
     },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    useQueryClient(qraftOptions, queryClientByArg)
   ) as never;
 };