@openapi-qraft/react 1.1.5 → 1.2.0

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

@@ -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 { ServiceOperationResetQueriesCallback } from '../ServiceOperation.js';
+import type { ServiceOperationResetQueriesCallback } from '../ServiceOperation.js';
 
 export function refetchQueries<TData>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
     ServiceOperationResetQueriesCallback<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       TData
     >['refetchQueries']

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;
 };

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 { OperationRequestSchema } from '../lib/request.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: OperationRequestSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationRequestSchema,
       object | undefined,
       TVariables,
       unknown
@@ -33,11 +28,8 @@ export const useIsFetching: <TVariables = unknown>(
     );
   }
 
-  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 { OperationRequestSchema } from '../lib/request.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: OperationRequestSchema,
   args: Parameters<
     ServiceOperationMutation<
-      RequestClientSchema,
+      OperationRequestSchema,
       object | undefined,
       TVariables,
       TData
@@ -51,10 +51,8 @@ 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?.request) throw new Error(`QraftContext.request not found`);
 
   const mutationKey =
     options && 'mutationKey' in options
@@ -72,22 +70,30 @@ export const useMutation: <
         options?.mutationFn ??
         (parameters
           ? function (bodyPayload) {
-              return requestClient(schema, {
-                parameters,
-                body: bodyPayload as never,
-              });
+              return contextValue.request(
+                { baseUrl: contextValue.baseUrl },
+                schema,
+                {
+                  parameters,
+                  body: bodyPayload as never,
+                }
+              );
             }
           : function (parametersAndBodyPayload) {
               const { body, ...parameters } = parametersAndBodyPayload as {
                 body: unknown;
               };
 
-              return requestClient(schema, {
-                body,
-                parameters,
-              } as never);
+              return contextValue.request(
+                { baseUrl: contextValue.baseUrl },
+                schema,
+                {
+                  body,
+                  parameters,
+                } 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 { OperationRequestSchema } from '../lib/request.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: OperationRequestSchema,
   args: Parameters<
     ServiceOperationMutation<
-      RequestClientSchema,
+      OperationRequestSchema,
       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,30 @@ import { useContext } from 'react';
 import {
   QueriesResults,
   useQueries as useQueriesTanstack,
-  useQueryClient,
 } from '@tanstack/react-query';
 
 import { composeQueryKey } from '../lib/composeQueryKey.js';
+import type { OperationRequestSchema } from '../lib/request.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: OperationRequestSchema,
   args: Parameters<
-    ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useQueries']
+    ServiceOperationQuery<
+      OperationRequestSchema,
+      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?.request) throw new Error(`QraftContext.request not found`);
 
   return useQueriesTanstack(
     {
@@ -51,15 +53,19 @@ export const useQueries: (
           queryFn:
             optionsWithQueryKey.queryFn ??
             function ({ queryKey: [, queryParams], signal, meta }) {
-              return requestClient(schema, {
-                parameters: queryParams as never,
-                signal,
-                meta,
-              });
+              return contextValue.request(
+                { baseUrl: contextValue.baseUrl },
+                schema,
+                {
+                  parameters: queryParams as never,
+                  signal,
+                  meta,
+                }
+              );
             },
         };
       }),
     },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    useQueryClient(qraftOptions, queryClientByArg)
   ) as never;
 };

package/src/callbacks/useQuery.ts

@@ -5,14 +5,14 @@ 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 { OperationRequestSchema } from '../lib/request.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,
   ServiceOperationQueryKey,
@@ -20,21 +20,22 @@ import {
 
 export const useQuery: <TData = unknown, TError = DefaultError>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
-    ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useQuery']
+    ServiceOperationQuery<OperationRequestSchema, unknown, unknown>['useQuery']
   >
 ) => UseQueryResult<TData, TError> = (qraftOptions, schema, args) => {
   const [parameters, options, queryClientByArg] = args;
 
-  const { requestClient, queryClient: queryClientByContext } =
-    useContext(qraftOptions?.context ?? QraftContext) ?? {};
+  const contextValue = useContext(qraftOptions?.context ?? QraftContext);
+  if (!contextValue?.request) throw new Error(`QraftContext.request not found`);
 
-  if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
-
-  const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> =
+  const queryKey: ServiceOperationQueryKey<OperationRequestSchema, unknown> =
     Array.isArray(parameters)
-      ? (parameters as ServiceOperationQueryKey<RequestClientSchema, unknown>)
+      ? (parameters as ServiceOperationQueryKey<
+          OperationRequestSchema,
+          unknown
+        >)
       : composeQueryKey(schema, parameters);
 
   return useQueryTanstack(
@@ -44,13 +45,17 @@ export const useQuery: <TData = unknown, TError = DefaultError>(
       queryFn:
         options?.queryFn ??
         function ({ queryKey: [, queryParams], signal, meta }) {
-          return requestClient(schema, {
-            parameters: queryParams as never,
-            signal,
-            meta,
-          });
+          return contextValue.request(
+            { baseUrl: contextValue.baseUrl },
+            schema,
+            {
+              parameters: queryParams as never,
+              signal,
+              meta,
+            }
+          );
         },
     },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    useQueryClient(qraftOptions, queryClientByArg)
   ) as never;
 };

package/src/callbacks/useSuspenseInfiniteQuery.ts

@@ -4,16 +4,16 @@ import { useContext } from 'react';
 
 import type { DefaultError, InfiniteData } from '@tanstack/query-core';
 import {
-  useQueryClient,
   useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack,
   UseSuspenseInfiniteQueryResult,
 } 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 useSuspenseInfiniteQuery: <
   TData = InfiniteData<TQueryFnData>,
 >(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
+  schema: OperationRequestSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       unknown
     >['useSuspenseInfiniteQuery']
@@ -40,13 +40,11 @@ export const useSuspenseInfiniteQuery: <
 ) => {
   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)
@@ -59,13 +57,17 @@ export const useSuspenseInfiniteQuery: <
       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;
 };

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 { OperationRequestSchema } from '../lib/request.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: OperationRequestSchema,
   args: Parameters<
     ServiceOperationQuery<
-      RequestClientSchema,
+      OperationRequestSchema,
       unknown,
       unknown
     >['useSuspenseQueries']
@@ -27,10 +27,8 @@ 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?.request) throw new Error(`QraftContext.request not found`);
 
   return useSuspenseQueriesTanstack(
     {
@@ -55,15 +53,19 @@ export const useSuspenseQueries: (
           queryFn:
             optionsWithQueryKey.queryFn ??
             function ({ queryKey: [, queryParams], signal, meta }) {
-              return requestClient(schema, {
-                parameters: queryParams as never,
-                signal,
-                meta,
-              });
+              return contextValue.request(
+                { baseUrl: contextValue.baseUrl },
+                schema,
+                {
+                  parameters: queryParams as never,
+                  signal,
+                  meta,
+                }
+              );
             },
         };
       }),
     },
-    useQueryClient(queryClientByArg ?? queryClientByContext)
+    useQueryClient(qraftOptions, queryClientByArg)
   ) as never;
 };