@openapi-qraft/react 1.1.4 → 1.2.0

package/dist/callbacks/mutationFn.js.map

@@ -1 +1 @@
-{"version":3,"file":"mutationFn.js","sourceRoot":"","sources":["../../src/callbacks/mutationFn.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,YAA4C,EAC5C,MAA2B,EAC3B,IAAa,EACb,EAAE;IACF,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAOzB,CAAC;IACF,OAAO,MAAM,CAAC,MAAM,EAAE;QACpB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"mutationFn.js","sourceRoot":"","sources":["../../src/callbacks/mutationFn.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,YAA4C,EAC5C,MAA8B,EAC9B,IAAa,EACb,EAAE;IACF,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAOzB,CAAC;IACF,OAAO,MAAM,CAAC,MAAM,EAAE;QACpB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/callbacks/refetchQueries.d.ts

@@ -0,0 +1,5 @@
+import type { OperationRequestSchema } from '../lib/request.js';
+import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationResetQueriesCallback } from '../ServiceOperation.js';
+export declare function refetchQueries<TData>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationResetQueriesCallback<OperationRequestSchema, unknown, TData>['refetchQueries']>): Promise<void>;
+//# sourceMappingURL=refetchQueries.d.ts.map

package/dist/callbacks/refetchQueries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"refetchQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/refetchQueries.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,wBAAwB,CAAC;AAEnF,wBAAgB,cAAc,CAAC,KAAK,EAClC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,oCAAoC,CAClC,sBAAsB,EACtB,OAAO,EACP,KAAK,CACN,CAAC,gBAAgB,CAAC,CACpB,GACA,OAAO,CAAC,IAAI,CAAC,CAMf"}

package/dist/callbacks/refetchQueries.js

@@ -0,0 +1,5 @@
+import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
+export function refetchQueries(qraftOptions, schema, args) {
+    return callQueryClientMethodWithQueryFilters('refetchQueries', schema, args);
+}
+//# sourceMappingURL=refetchQueries.js.map

package/dist/callbacks/refetchQueries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"refetchQueries.js","sourceRoot":"","sources":["../../src/callbacks/refetchQueries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AAKxG,MAAM,UAAU,cAAc,CAC5B,YAA4C,EAC5C,MAA8B,EAC9B,IAMC;IAED,OAAO,qCAAqC,CAC1C,gBAAgB,EAChB,MAAM,EACN,IAAa,CACL,CAAC;AACb,CAAC"}

package/dist/callbacks/resetQueries.d.ts

@@ -1,5 +1,5 @@
+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 declare function resetQueries<TData>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationResetQueriesCallback<RequestClientSchema, unknown, TData>['resetQueries']>): Promise<void>;
+export declare function resetQueries<TData>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationResetQueriesCallback<OperationRequestSchema, unknown, TData>['resetQueries']>): Promise<void>;
 //# sourceMappingURL=resetQueries.d.ts.map

package/dist/callbacks/resetQueries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resetQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/resetQueries.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,wBAAwB,CAAC;AAEnF,wBAAgB,YAAY,CAAC,KAAK,EAChC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,oCAAoC,CAClC,mBAAmB,EACnB,OAAO,EACP,KAAK,CACN,CAAC,cAAc,CAAC,CAClB,GACA,OAAO,CAAC,IAAI,CAAC,CAMf"}
+{"version":3,"file":"resetQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/resetQueries.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,wBAAwB,CAAC;AAEnF,wBAAgB,YAAY,CAAC,KAAK,EAChC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,oCAAoC,CAClC,sBAAsB,EACtB,OAAO,EACP,KAAK,CACN,CAAC,cAAc,CAAC,CAClB,GACA,OAAO,CAAC,IAAI,CAAC,CAMf"}

package/dist/callbacks/resetQueries.js.map

@@ -1 +1 @@
-{"version":3,"file":"resetQueries.js","sourceRoot":"","sources":["../../src/callbacks/resetQueries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AAKxG,MAAM,UAAU,YAAY,CAC1B,YAA4C,EAC5C,MAA2B,EAC3B,IAMC;IAED,OAAO,qCAAqC,CAC1C,cAAc,EACd,MAAM,EACN,IAAa,CACL,CAAC;AACb,CAAC"}
+{"version":3,"file":"resetQueries.js","sourceRoot":"","sources":["../../src/callbacks/resetQueries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AAKxG,MAAM,UAAU,YAAY,CAC1B,YAA4C,EAC5C,MAA8B,EAC9B,IAMC;IAED,OAAO,qCAAqC,CAC1C,cAAc,EACd,MAAM,EACN,IAAa,CACL,CAAC;AACb,CAAC"}

package/dist/callbacks/setInfiniteQueryData.d.ts

@@ -1,6 +1,6 @@
 import { InfiniteData } from '@tanstack/query-core';
+import type { OperationRequestSchema } from '../lib/request.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import type { ServiceOperationQuery } from '../ServiceOperation.js';
-export declare function setInfiniteQueryData<TData>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, unknown, TData>['setInfiniteQueryData']>): InfiniteData<TData> | undefined;
+export declare function setInfiniteQueryData<TData>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, TData>['setInfiniteQueryData']>): InfiniteData<TData> | undefined;
 //# sourceMappingURL=setInfiniteQueryData.d.ts.map

package/dist/callbacks/setInfiniteQueryData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setInfiniteQueryData.d.ts","sourceRoot":"","sources":["../../src/callbacks/setInfiniteQueryData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,oBAAoB,CAAC,KAAK,EACxC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,mBAAmB,EACnB,OAAO,EACP,KAAK,CACN,CAAC,sBAAsB,CAAC,CAC1B,GACA,YAAY,CAAC,KAAK,CAAC,GAAG,SAAS,CAWjC"}
+{"version":3,"file":"setInfiniteQueryData.d.ts","sourceRoot":"","sources":["../../src/callbacks/setInfiniteQueryData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,oBAAoB,CAAC,KAAK,EACxC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,sBAAsB,EACtB,OAAO,EACP,KAAK,CACN,CAAC,sBAAsB,CAAC,CAC1B,GACA,YAAY,CAAC,KAAK,CAAC,GAAG,SAAS,CAWjC"}

package/dist/callbacks/setInfiniteQueryData.js.map

@@ -1 +1 @@
-{"version":3,"file":"setInfiniteQueryData.js","sourceRoot":"","sources":["../../src/callbacks/setInfiniteQueryData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAQ5E,MAAM,UAAU,oBAAoB,CAClC,YAA4C,EAC5C,MAA2B,EAC3B,IAMC;IAED,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAEzD,MAAM,QAAQ,GAGV,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QAC3B,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAEhD,OAAO,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAgB,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC"}
+{"version":3,"file":"setInfiniteQueryData.js","sourceRoot":"","sources":["../../src/callbacks/setInfiniteQueryData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAQ5E,MAAM,UAAU,oBAAoB,CAClC,YAA4C,EAC5C,MAA8B,EAC9B,IAMC;IAED,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAEzD,MAAM,QAAQ,GAGV,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QAC3B,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAEhD,OAAO,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAgB,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC"}

package/dist/callbacks/setQueryData.d.ts

@@ -1,5 +1,5 @@
+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 declare function setQueryData<TData>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, unknown, TData>['setQueryData']>): TData | undefined;
+export declare function setQueryData<TData>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, TData>['setQueryData']>): TData | undefined;
 //# sourceMappingURL=setQueryData.d.ts.map

package/dist/callbacks/setQueryData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setQueryData.d.ts","sourceRoot":"","sources":["../../src/callbacks/setQueryData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,YAAY,CAAC,KAAK,EAChC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,mBAAmB,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,cAAc,CAAC,CAC3E,GACA,KAAK,GAAG,SAAS,CASnB"}
+{"version":3,"file":"setQueryData.d.ts","sourceRoot":"","sources":["../../src/callbacks/setQueryData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,YAAY,CAAC,KAAK,EAChC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,sBAAsB,EACtB,OAAO,EACP,KAAK,CACN,CAAC,cAAc,CAAC,CAClB,GACA,KAAK,GAAG,SAAS,CASnB"}

package/dist/callbacks/setQueryData.js.map

@@ -1 +1 @@
-{"version":3,"file":"setQueryData.js","sourceRoot":"","sources":["../../src/callbacks/setQueryData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAQ5D,MAAM,UAAU,YAAY,CAC1B,YAA4C,EAC5C,MAA2B,EAC3B,IAEC;IAED,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAEzD,MAAM,QAAQ,GACZ,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACvB,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE1C,OAAO,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAgB,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC"}
+{"version":3,"file":"setQueryData.js","sourceRoot":"","sources":["../../src/callbacks/setQueryData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAQ5D,MAAM,UAAU,YAAY,CAC1B,YAA4C,EAC5C,MAA8B,EAC9B,IAMC;IAED,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAEzD,MAAM,QAAQ,GACZ,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACvB,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE1C,OAAO,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAgB,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC"}

package/dist/callbacks/useInfiniteQuery.d.ts

@@ -1,7 +1,7 @@
 import type { DefaultError, InfiniteData } from '@tanstack/query-core';
 import { UseInfiniteQueryResult } from '@tanstack/react-query';
+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 declare const useInfiniteQuery: <TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useInfiniteQuery']>) => UseInfiniteQueryResult<TData, TError>;
+export declare const useInfiniteQuery: <TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, unknown>['useInfiniteQuery']>) => UseInfiniteQueryResult<TData, TError>;
 //# sourceMappingURL=useInfiniteQuery.d.ts.map

package/dist/callbacks/useInfiniteQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useInfiniteQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useInfiniteQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAEL,sBAAsB,EAEvB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAEL,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,gBAAgB,EAAE,CAC7B,YAAY,EACZ,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,EAElC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,mBAAmB,EACnB,OAAO,EACP,OAAO,CACR,CAAC,kBAAkB,CAAC,CACtB,KACE,sBAAsB,CAAC,KAAK,EAAE,MAAM,CA+BxC,CAAC"}
+{"version":3,"file":"useInfiniteQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useInfiniteQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAEL,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAGhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAEL,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,gBAAgB,EAAE,CAC7B,YAAY,EACZ,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,EAElC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,sBAAsB,EACtB,OAAO,EACP,OAAO,CACR,CAAC,kBAAkB,CAAC,CACtB,KACE,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAiCxC,CAAC"}

package/dist/callbacks/useInfiniteQuery.js

@@ -1,14 +1,15 @@
 'use client';
 import { useContext } from 'react';
-import { useInfiniteQuery as useInfiniteQueryBase, useQueryClient, } from '@tanstack/react-query';
+import { useInfiniteQuery as useInfiniteQueryBase, } from '@tanstack/react-query';
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 import { shelfMerge } from '../lib/shelfMerge.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
 import { QraftContext } from '../QraftContext.js';
 export const useInfiniteQuery = (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 = Array.isArray(parameters)
         ? parameters
         : composeInfiniteQueryKey(schema, parameters);
@@ -17,12 +18,12 @@ export const useInfiniteQuery = (qraftOptions, schema, args) => {
         queryKey,
         queryFn: options?.queryFn ??
             function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-                return requestClient(schema, {
+                return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
                     parameters: shelfMerge(2, queryParams, pageParam),
                     signal,
                     meta,
                 });
             },
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    }, useQueryClient(qraftOptions, queryClientByArg));
 };
 //# sourceMappingURL=useInfiniteQuery.js.map

package/dist/callbacks/useInfiniteQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useInfiniteQuery.js","sourceRoot":"","sources":["../../src/callbacks/useInfiniteQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,gBAAgB,IAAI,oBAAoB,EAExC,cAAc,GACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,gBAAgB,GAcgB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAC1E,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAGV,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QAC3B,CAAC,CAAE,UAAoB;QACvB,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAEhD,OAAO,oBAAoB,CACzB;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9D,OAAO,aAAa,CAAC,MAAM,EAAE;oBAC3B,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAU;oBAC1D,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"useInfiniteQuery.js","sourceRoot":"","sources":["../../src/callbacks/useInfiniteQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,gBAAgB,IAAI,oBAAoB,GAEzC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,MAAM,CAAC,MAAM,gBAAgB,GAcgB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAC1E,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,CAAC;IACvE,IAAI,CAAC,YAAY,EAAE,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAE9E,MAAM,QAAQ,GAGV,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QAC3B,CAAC,CAAE,UAAoB;QACvB,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAEhD,OAAO,oBAAoB,CACzB;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9D,OAAO,YAAY,CAAC,OAAO,CACzB,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,EACjC,MAAM,EACN;oBACE,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAU;oBAC1D,MAAM;oBACN,IAAI;iBACL,CACF,CAAC;YACJ,CAAC;KACJ,EACD,cAAc,CAAC,YAAY,EAAE,gBAAgB,CAAC,CACtC,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useIsFetching.d.ts

@@ -0,0 +1,5 @@
+import type { OperationRequestSchema } from '../lib/request.js';
+import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { ServiceOperationQuery } from '../ServiceOperation.js';
+export declare const useIsFetching: <TVariables = unknown>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, object | undefined, TVariables, unknown>['useIsFetching']>) => number;
+//# sourceMappingURL=useIsFetching.d.ts.map

package/dist/callbacks/useIsFetching.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useIsFetching.d.ts","sourceRoot":"","sources":["../../src/callbacks/useIsFetching.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAEpE,eAAO,MAAM,aAAa,EAAE,CAAC,UAAU,GAAG,OAAO,EAC/C,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,sBAAsB,EACtB,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,OAAO,CACR,CAAC,eAAe,CAAC,CACnB,KACE,MAaJ,CAAC"}

package/dist/callbacks/useIsFetching.js

@@ -0,0 +1,12 @@
+'use client';
+import { useIsFetching as useIsFetchingTanstack } from '@tanstack/react-query';
+import { composeQueryFilters } from '../lib/composeQueryFilters.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
+export const useIsFetching = (qraftOptions, schema, args) => {
+    const [filters, queryClientByArg] = args;
+    if (filters && 'parameters' in filters && 'mutationKey' in filters) {
+        throw new Error(`'useMutationState': 'parameters' and 'mutationKey' cannot be used together`);
+    }
+    return useIsFetchingTanstack(composeQueryFilters(schema, filters), useQueryClient(qraftOptions, queryClientByArg));
+};
+//# sourceMappingURL=useIsFetching.js.map

package/dist/callbacks/useIsFetching.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useIsFetching.js","sourceRoot":"","sources":["../../src/callbacks/useIsFetching.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,MAAM,CAAC,MAAM,aAAa,GAWZ,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAC3C,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,IAAI,OAAO,IAAI,YAAY,IAAI,OAAO,IAAI,aAAa,IAAI,OAAO,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IAED,OAAO,qBAAqB,CAC1B,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAU,EAC7C,cAAc,CAAC,YAAY,EAAE,gBAAgB,CAAC,CACtC,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useMutation.d.ts

@@ -1,7 +1,7 @@
 import type { DefaultError } from '@tanstack/query-core';
 import { UseMutationResult } from '@tanstack/react-query';
+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 declare const useMutation: <TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationMutation<RequestClientSchema, object | undefined, TVariables, TData>['useMutation']>) => UseMutationResult<TData, TError, TVariables, TContext>;
+export declare const useMutation: <TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationMutation<OperationRequestSchema, object | undefined, TVariables, TData>['useMutation']>) => UseMutationResult<TData, TError, TVariables, TContext>;
 //# sourceMappingURL=useMutation.d.ts.map

package/dist/callbacks/useMutation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMutation.d.ts","sourceRoot":"","sources":["../../src/callbacks/useMutation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAEL,iBAAiB,EAElB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACL,wBAAwB,EAEzB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,WAAW,EAAE,CACxB,KAAK,GAAG,OAAO,EACf,MAAM,GAAG,YAAY,EACrB,UAAU,GAAG,IAAI,EACjB,QAAQ,GAAG,OAAO,EAElB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,mBAAmB,EACnB,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,aAAa,CAAC,CACjB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAwDzD,CAAC"}
+{"version":3,"file":"useMutation.d.ts","sourceRoot":"","sources":["../../src/callbacks/useMutation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EACL,wBAAwB,EAEzB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,WAAW,EAAE,CACxB,KAAK,GAAG,OAAO,EACf,MAAM,GAAG,YAAY,EACrB,UAAU,GAAG,IAAI,EACjB,QAAQ,GAAG,OAAO,EAElB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,sBAAsB,EACtB,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,aAAa,CAAC,CACjB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CA8DzD,CAAC"}

package/dist/callbacks/useMutation.js

@@ -1,7 +1,8 @@
 'use client';
 import { useContext } from 'react';
-import { useMutation as useMutationBase, useQueryClient, } from '@tanstack/react-query';
+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';
 export const useMutation = (qraftOptions, schema, args) => {
     const [parameters, options, queryClientByArg] = args;
@@ -10,9 +11,9 @@ export const useMutation = (qraftOptions, schema, args) => {
         options &&
         'mutationKey' in options)
         throw new Error(`'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
         ? options.mutationKey
         : composeMutationKey(schema, parameters);
@@ -22,18 +23,18 @@ export const useMutation = (qraftOptions, schema, args) => {
         mutationFn: options?.mutationFn ??
             (parameters
                 ? function (bodyPayload) {
-                    return requestClient(schema, {
+                    return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
                         parameters,
                         body: bodyPayload,
                     });
                 }
                 : function (parametersAndBodyPayload) {
                     const { body, ...parameters } = parametersAndBodyPayload;
-                    return requestClient(schema, {
+                    return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
                         body,
                         parameters,
                     });
                 }),
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    }, useQueryClient(qraftOptions, queryClientByArg));
 };
 //# sourceMappingURL=useMutation.js.map

package/dist/callbacks/useMutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMutation.js","sourceRoot":"","sources":["../../src/callbacks/useMutation.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,WAAW,IAAI,eAAe,EAE9B,cAAc,GACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,WAAW,GAgBsC,CAC5D,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,IACE,UAAU;QACV,OAAO,UAAU,KAAK,QAAQ;QAC9B,OAAO;QACP,aAAa,IAAI,OAAO;QAExB,MAAM,IAAI,KAAK,CACb,6EAA6E,CAC9E,CAAC;IAEJ,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,WAAW,GACf,OAAO,IAAI,aAAa,IAAI,OAAO;QACjC,CAAC,CAAE,OAAO,CAAC,WAGP;QACJ,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE7C,OAAO,eAAe,CACpB;QACE,GAAG,OAAO;QACV,WAAW;QACX,UAAU,EACR,OAAO,EAAE,UAAU;YACnB,CAAC,UAAU;gBACT,CAAC,CAAC,UAAU,WAAW;oBACnB,OAAO,aAAa,CAAC,MAAM,EAAE;wBAC3B,UAAU;wBACV,IAAI,EAAE,WAAoB;qBAC3B,CAAC,CAAC;gBACL,CAAC;gBACH,CAAC,CAAC,UAAU,wBAAwB;oBAChC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,wBAE/B,CAAC;oBAEF,OAAO,aAAa,CAAC,MAAM,EAAE;wBAC3B,IAAI;wBACJ,UAAU;qBACF,CAAC,CAAC;gBACd,CAAC,CAAC;KACT,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"useMutation.js","sourceRoot":"","sources":["../../src/callbacks/useMutation.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,WAAW,IAAI,eAAe,GAE/B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,MAAM,CAAC,MAAM,WAAW,GAgBsC,CAC5D,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,IACE,UAAU;QACV,OAAO,UAAU,KAAK,QAAQ;QAC9B,OAAO;QACP,aAAa,IAAI,OAAO;QAExB,MAAM,IAAI,KAAK,CACb,6EAA6E,CAC9E,CAAC;IAEJ,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,CAAC;IACvE,IAAI,CAAC,YAAY,EAAE,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAE9E,MAAM,WAAW,GACf,OAAO,IAAI,aAAa,IAAI,OAAO;QACjC,CAAC,CAAE,OAAO,CAAC,WAGP;QACJ,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE7C,OAAO,eAAe,CACpB;QACE,GAAG,OAAO;QACV,WAAW;QACX,UAAU,EACR,OAAO,EAAE,UAAU;YACnB,CAAC,UAAU;gBACT,CAAC,CAAC,UAAU,WAAW;oBACnB,OAAO,YAAY,CAAC,OAAO,CACzB,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,EACjC,MAAM,EACN;wBACE,UAAU;wBACV,IAAI,EAAE,WAAoB;qBAC3B,CACF,CAAC;gBACJ,CAAC;gBACH,CAAC,CAAC,UAAU,wBAAwB;oBAChC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,wBAE/B,CAAC;oBAEF,OAAO,YAAY,CAAC,OAAO,CACzB,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,EACjC,MAAM,EACN;wBACE,IAAI;wBACJ,UAAU;qBACF,CACX,CAAC;gBACJ,CAAC,CAAC;KACT,EACD,cAAc,CAAC,YAAY,EAAE,gBAAgB,CAAC,CACtC,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useMutationState.d.ts

@@ -1,7 +1,7 @@
 import type { DefaultError } from '@tanstack/query-core';
 import { UseMutationResult } from '@tanstack/react-query';
+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 declare const useMutationState: <TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationMutation<RequestClientSchema, object | undefined, TVariables, TData>['useMutationState']>) => UseMutationResult<TData, TError, TVariables, TContext>;
+export declare const useMutationState: <TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationMutation<OperationRequestSchema, object | undefined, TVariables, TData>['useMutationState']>) => UseMutationResult<TData, TError, TVariables, TContext>;
 //# sourceMappingURL=useMutationState.d.ts.map

package/dist/callbacks/useMutationState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMutationState.d.ts","sourceRoot":"","sources":["../../src/callbacks/useMutationState.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,iBAAiB,EAGlB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,eAAO,MAAM,gBAAgB,EAAE,CAC7B,KAAK,GAAG,OAAO,EACf,MAAM,GAAG,YAAY,EACrB,UAAU,GAAG,OAAO,EACpB,QAAQ,GAAG,OAAO,EAElB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,mBAAmB,EACnB,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,kBAAkB,CAAC,CACtB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CA0CzD,CAAC"}
+{"version":3,"file":"useMutationState.d.ts","sourceRoot":"","sources":["../../src/callbacks/useMutationState.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,iBAAiB,EAElB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,eAAO,MAAM,gBAAgB,EAAE,CAC7B,KAAK,GAAG,OAAO,EACf,MAAM,GAAG,YAAY,EACrB,UAAU,GAAG,OAAO,EACpB,QAAQ,GAAG,OAAO,EAElB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,sBAAsB,EACtB,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,kBAAkB,CAAC,CACtB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAqCzD,CAAC"}

package/dist/callbacks/useMutationState.js

@@ -1,8 +1,7 @@
 'use client';
-import { useContext } from 'react';
-import { useMutationState as useMutationStateTanstack, useQueryClient, } from '@tanstack/react-query';
+import { useMutationState as useMutationStateTanstack, } from '@tanstack/react-query';
 import { composeMutationKey } from '../lib/composeMutationKey.js';
-import { QraftContext } from '../QraftContext.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
 export const useMutationState = (qraftOptions, schema, args) => {
     const [options, queryClientByArg] = args;
     if (options?.filters &&
@@ -10,9 +9,6 @@ export const useMutationState = (qraftOptions, schema, args) => {
         'mutationKey' in options.filters) {
         throw new Error(`'useMutationState': 'parameters' and 'mutationKey' cannot be used together`);
     }
-    const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
-    if (!requestClient)
-        throw new Error(`QraftContext.requestClient not found`);
     const filters = options?.filters;
     return useMutationStateTanstack({
         ...options,
@@ -24,6 +20,6 @@ export const useMutationState = (qraftOptions, schema, args) => {
                     ? filters.parameters
                     : undefined),
             },
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    }, useQueryClient(qraftOptions, queryClientByArg));
 };
 //# sourceMappingURL=useMutationState.js.map

package/dist/callbacks/useMutationState.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMutationState.js","sourceRoot":"","sources":["../../src/callbacks/useMutationState.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EAEL,gBAAgB,IAAI,wBAAwB,EAC5C,cAAc,GACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,MAAM,CAAC,MAAM,gBAAgB,GAgBiC,CAC5D,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,IACE,OAAO,EAAE,OAAO;QAChB,YAAY,IAAI,OAAO,CAAC,OAAO;QAC/B,aAAa,IAAI,OAAO,CAAC,OAAO,EAChC,CAAC;QACD,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;IAEjC,OAAO,wBAAwB,CAC7B;QACE,GAAG,OAAO;QACV,OAAO,EACL,OAAO,IAAI,aAAa,IAAI,OAAO;YACjC,CAAC,CAAC,OAAO;YACT,CAAC,CAAC;gBACE,GAAG,OAAO;gBACV,WAAW,EAAE,kBAAkB,CAC7B,MAAM,EACN,OAAO,IAAI,YAAY,IAAI,OAAO;oBAChC,CAAC,CAAC,OAAO,CAAC,UAAU;oBACpB,CAAC,CAAC,SAAS,CACd;aACF;KACC,EACV,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"useMutationState.js","sourceRoot":"","sources":["../../src/callbacks/useMutationState.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAKb,OAAO,EAEL,gBAAgB,IAAI,wBAAwB,GAC7C,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,MAAM,CAAC,MAAM,gBAAgB,GAgBiC,CAC5D,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,IACE,OAAO,EAAE,OAAO;QAChB,YAAY,IAAI,OAAO,CAAC,OAAO;QAC/B,aAAa,IAAI,OAAO,CAAC,OAAO,EAChC,CAAC;QACD,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;IAEjC,OAAO,wBAAwB,CAC7B;QACE,GAAG,OAAO;QACV,OAAO,EACL,OAAO,IAAI,aAAa,IAAI,OAAO;YACjC,CAAC,CAAC,OAAO;YACT,CAAC,CAAC;gBACE,GAAG,OAAO;gBACV,WAAW,EAAE,kBAAkB,CAC7B,MAAM,EACN,OAAO,IAAI,YAAY,IAAI,OAAO;oBAChC,CAAC,CAAC,OAAO,CAAC,UAAU;oBACpB,CAAC,CAAC,SAAS,CACd;aACF;KACC,EACV,cAAc,CAAC,YAAY,EAAE,gBAAgB,CAAC,CACtC,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useQueries.d.ts

@@ -1,6 +1,6 @@
 import { QueriesResults } from '@tanstack/react-query';
+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 declare const useQueries: (qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useQueries']>) => QueriesResults<never>;
+export declare const useQueries: (qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, unknown>['useQueries']>) => QueriesResults<never>;
 //# sourceMappingURL=useQueries.d.ts.map

package/dist/callbacks/useQueries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/useQueries.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAGf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,eAAO,MAAM,UAAU,EAAE,CACvB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,mBAAmB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,YAAY,CAAC,CAC3E,KACE,cAAc,CAAC,KAAK,CA0CxB,CAAC"}
+{"version":3,"file":"useQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/useQueries.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAEf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,eAAO,MAAM,UAAU,EAAE,CACvB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,sBAAsB,EACtB,OAAO,EACP,OAAO,CACR,CAAC,YAAY,CAAC,CAChB,KACE,cAAc,CAAC,KAAK,CA4CxB,CAAC"}

package/dist/callbacks/useQueries.js

@@ -1,13 +1,14 @@
 'use client';
 import { useContext } from 'react';
-import { useQueries as useQueriesTanstack, useQueryClient, } from '@tanstack/react-query';
+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';
 export const useQueries = (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({
         ...options,
         queries: options.queries.map((queryOptions) => {
@@ -24,7 +25,7 @@ export const useQueries = (qraftOptions, schema, args) => {
                 ...optionsWithQueryKey,
                 queryFn: optionsWithQueryKey.queryFn ??
                     function ({ queryKey: [, queryParams], signal, meta }) {
-                        return requestClient(schema, {
+                        return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
                             parameters: queryParams,
                             signal,
                             meta,
@@ -32,6 +33,6 @@ export const useQueries = (qraftOptions, schema, args) => {
                     },
             };
         }),
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    }, useQueryClient(qraftOptions, queryClientByArg));
 };
 //# sourceMappingURL=useQueries.js.map

package/dist/callbacks/useQueries.js.map

@@ -1 +1 @@
-{"version":3,"file":"useQueries.js","sourceRoot":"","sources":["../../src/callbacks/useQueries.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAEL,UAAU,IAAI,kBAAkB,EAChC,cAAc,GACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,MAAM,CAAC,MAAM,UAAU,GAMM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAC1D,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,OAAO,kBAAkB,CACvB;QACE,GAAG,OAAO;QACV,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;YAC5C,MAAM,mBAAmB,GACvB,YAAY,IAAI,YAAY;gBAC1B,CAAC,CAAC,CAAC,GAAG,EAAE;oBACJ,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CACpC;wBACE,QAAQ,EAAE,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,UAAU,CAAC;qBAC3D,EACD,YAAY,CACb,CAAC;oBACF,OAAO,gBAAgB,CAAC,UAAU,CAAC;oBACnC,OAAO,gBAAgB,CAAC;gBAC1B,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,YAAY,CAAC;YAEnB,OAAO;gBACL,GAAG,mBAAmB;gBACtB,OAAO,EACL,mBAAmB,CAAC,OAAO;oBAC3B,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;wBACnD,OAAO,aAAa,CAAC,MAAM,EAAE;4BAC3B,UAAU,EAAE,WAAoB;4BAChC,MAAM;4BACN,IAAI;yBACL,CAAC,CAAC;oBACL,CAAC;aACJ,CAAC;QACJ,CAAC,CAAC;KACH,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"useQueries.js","sourceRoot":"","sources":["../../src/callbacks/useQueries.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAEL,UAAU,IAAI,kBAAkB,GACjC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,MAAM,CAAC,MAAM,UAAU,GAUM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAC1D,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,CAAC;IACvE,IAAI,CAAC,YAAY,EAAE,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAE9E,OAAO,kBAAkB,CACvB;QACE,GAAG,OAAO;QACV,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;YAC5C,MAAM,mBAAmB,GACvB,YAAY,IAAI,YAAY;gBAC1B,CAAC,CAAC,CAAC,GAAG,EAAE;oBACJ,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CACpC;wBACE,QAAQ,EAAE,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,UAAU,CAAC;qBAC3D,EACD,YAAY,CACb,CAAC;oBACF,OAAO,gBAAgB,CAAC,UAAU,CAAC;oBACnC,OAAO,gBAAgB,CAAC;gBAC1B,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,YAAY,CAAC;YAEnB,OAAO;gBACL,GAAG,mBAAmB;gBACtB,OAAO,EACL,mBAAmB,CAAC,OAAO;oBAC3B,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;wBACnD,OAAO,YAAY,CAAC,OAAO,CACzB,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,EACjC,MAAM,EACN;4BACE,UAAU,EAAE,WAAoB;4BAChC,MAAM;4BACN,IAAI;yBACL,CACF,CAAC;oBACJ,CAAC;aACJ,CAAC;QACJ,CAAC,CAAC;KACH,EACD,cAAc,CAAC,YAAY,EAAE,gBAAgB,CAAC,CACtC,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useQuery.d.ts

@@ -1,7 +1,7 @@
 import type { DefaultError } from '@tanstack/query-core';
-import { UseQueryResult } from '@tanstack/react-query';
+import { type UseQueryResult } from '@tanstack/react-query';
+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 declare const useQuery: <TData = unknown, TError = DefaultError>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useQuery']>) => UseQueryResult<TData, TError>;
+export declare const useQuery: <TData = unknown, TError = DefaultError>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, unknown>['useQuery']>) => UseQueryResult<TData, TError>;
 //# sourceMappingURL=useQuery.d.ts.map

package/dist/callbacks/useQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAGL,cAAc,EACf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,QAAQ,EAAE,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,YAAY,EAC5D,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,mBAAmB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,UAAU,CAAC,CACzE,KACE,cAAc,CAAC,KAAK,EAAE,MAAM,CA6BhC,CAAC"}
+{"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,QAAQ,EAAE,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,YAAY,EAC5D,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,sBAAsB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,UAAU,CAAC,CAC5E,KACE,cAAc,CAAC,KAAK,EAAE,MAAM,CAkChC,CAAC"}

package/dist/callbacks/useQuery.js

@@ -1,13 +1,14 @@
 'use client';
 import { useContext } from 'react';
-import { useQuery as useQueryTanstack, useQueryClient, } from '@tanstack/react-query';
+import { useQuery as useQueryTanstack, } from '@tanstack/react-query';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
 import { QraftContext } from '../QraftContext.js';
 export const useQuery = (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 = Array.isArray(parameters)
         ? parameters
         : composeQueryKey(schema, parameters);
@@ -16,12 +17,12 @@ export const useQuery = (qraftOptions, schema, args) => {
         queryKey,
         queryFn: options?.queryFn ??
             function ({ queryKey: [, queryParams], signal, meta }) {
-                return requestClient(schema, {
+                return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
                     parameters: queryParams,
                     signal,
                     meta,
                 });
             },
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    }, useQueryClient(qraftOptions, queryClientByArg));
 };
 //# sourceMappingURL=useQuery.js.map

package/dist/callbacks/useQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/callbacks/useQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,QAAQ,IAAI,gBAAgB,EAC5B,cAAc,GAEf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,QAAQ,GAMgB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,QAAQ,GACZ,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACvB,CAAC,CAAE,UAAqE;QACxE,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE1C,OAAO,gBAAgB,CACrB;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;gBACnD,OAAO,aAAa,CAAC,MAAM,EAAE;oBAC3B,UAAU,EAAE,WAAoB;oBAChC,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/callbacks/useQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,QAAQ,IAAI,gBAAgB,GAE7B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,MAAM,CAAC,MAAM,QAAQ,GAMgB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,CAAC;IACvE,IAAI,CAAC,YAAY,EAAE,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAE9E,MAAM,QAAQ,GACZ,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACvB,CAAC,CAAE,UAGC;QACJ,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE1C,OAAO,gBAAgB,CACrB;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;gBACnD,OAAO,YAAY,CAAC,OAAO,CACzB,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,EACjC,MAAM,EACN;oBACE,UAAU,EAAE,WAAoB;oBAChC,MAAM;oBACN,IAAI;iBACL,CACF,CAAC;YACJ,CAAC;KACJ,EACD,cAAc,CAAC,YAAY,EAAE,gBAAgB,CAAC,CACtC,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useSuspenseInfiniteQuery.d.ts

@@ -1,7 +1,7 @@
 import type { DefaultError, InfiniteData } from '@tanstack/query-core';
 import { UseSuspenseInfiniteQueryResult } from '@tanstack/react-query';
+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 declare const useSuspenseInfiniteQuery: <TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useSuspenseInfiniteQuery']>) => UseSuspenseInfiniteQueryResult<TData, TError>;
+export declare const useSuspenseInfiniteQuery: <TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, unknown>['useSuspenseInfiniteQuery']>) => UseSuspenseInfiniteQueryResult<TData, TError>;
 //# sourceMappingURL=useSuspenseInfiniteQuery.d.ts.map

package/dist/callbacks/useSuspenseInfiniteQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSuspenseInfiniteQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseInfiniteQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAGL,8BAA8B,EAC/B,MAAM,uBAAuB,CAAC;AAI/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAEL,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,wBAAwB,EAAE,CACrC,YAAY,EACZ,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,EAElC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,mBAAmB,EACnB,OAAO,EACP,OAAO,CACR,CAAC,0BAA0B,CAAC,CAC9B,KACE,8BAA8B,CAAC,KAAK,EAAE,MAAM,CAmChD,CAAC"}
+{"version":3,"file":"useSuspenseInfiniteQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseInfiniteQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAEL,8BAA8B,EAC/B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAGhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAEL,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,wBAAwB,EAAE,CACrC,YAAY,EACZ,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,EAElC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,sBAAsB,EACtB,OAAO,EACP,OAAO,CACR,CAAC,0BAA0B,CAAC,CAC9B,KACE,8BAA8B,CAAC,KAAK,EAAE,MAAM,CAqChD,CAAC"}

package/dist/callbacks/useSuspenseInfiniteQuery.js

@@ -1,14 +1,15 @@
 'use client';
 import { useContext } from 'react';
-import { useQueryClient, useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack, } from '@tanstack/react-query';
+import { useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack, } from '@tanstack/react-query';
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 import { shelfMerge } from '../lib/shelfMerge.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
 import { QraftContext } from '../QraftContext.js';
 export const useSuspenseInfiniteQuery = (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 = Array.isArray(parameters)
         ? parameters
         : composeInfiniteQueryKey(schema, parameters);
@@ -17,12 +18,12 @@ export const useSuspenseInfiniteQuery = (qraftOptions, schema, args) => {
         queryKey,
         queryFn: options?.queryFn ??
             function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-                return requestClient(schema, {
+                return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
                     parameters: shelfMerge(2, queryParams, pageParam),
                     signal,
                     meta,
                 });
             },
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    }, useQueryClient(qraftOptions, queryClientByArg));
 };
 //# sourceMappingURL=useSuspenseInfiniteQuery.js.map

package/dist/callbacks/useSuspenseInfiniteQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSuspenseInfiniteQuery.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseInfiniteQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,cAAc,EACd,wBAAwB,IAAI,gCAAgC,GAE7D,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,wBAAwB,GAcgB,CACnD,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAGV,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QAC3B,CAAC,CAAE,UAAoB;QACvB,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAEhD,OAAO,gCAAgC,CACrC;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9D,OAAO,aAAa,CAAC,MAAM,EAAE;oBAC3B,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAU;oBAC1D,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"useSuspenseInfiniteQuery.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseInfiniteQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,wBAAwB,IAAI,gCAAgC,GAE7D,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,MAAM,CAAC,MAAM,wBAAwB,GAcgB,CACnD,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,CAAC;IACvE,IAAI,CAAC,YAAY,EAAE,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAE9E,MAAM,QAAQ,GAGV,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QAC3B,CAAC,CAAE,UAAoB;QACvB,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAEhD,OAAO,gCAAgC,CACrC;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9D,OAAO,YAAY,CAAC,OAAO,CACzB,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,EACjC,MAAM,EACN;oBACE,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAU;oBAC1D,MAAM;oBACN,IAAI;iBACL,CACF,CAAC;YACJ,CAAC;KACJ,EACD,cAAc,CAAC,YAAY,EAAE,gBAAgB,CAAC,CACtC,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useSuspenseQueries.d.ts

@@ -1,6 +1,6 @@
 import { SuspenseQueriesResults } from '@tanstack/react-query';
+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 declare const useSuspenseQueries: (qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useSuspenseQueries']>) => SuspenseQueriesResults<never>;
+export declare const useSuspenseQueries: (qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, unknown>['useSuspenseQueries']>) => SuspenseQueriesResults<never>;
 //# sourceMappingURL=useSuspenseQueries.d.ts.map

package/dist/callbacks/useSuspenseQueries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSuspenseQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQueries.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EAGvB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,eAAO,MAAM,kBAAkB,EAAE,CAC/B,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,mBAAmB,EACnB,OAAO,EACP,OAAO,CACR,CAAC,oBAAoB,CAAC,CACxB,KACE,sBAAsB,CAAC,KAAK,CA0ChC,CAAC"}
+{"version":3,"file":"useSuspenseQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQueries.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EAEvB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,eAAO,MAAM,kBAAkB,EAAE,CAC/B,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,sBAAsB,EACtB,OAAO,EACP,OAAO,CACR,CAAC,oBAAoB,CAAC,CACxB,KACE,sBAAsB,CAAC,KAAK,CA4ChC,CAAC"}

package/dist/callbacks/useSuspenseQueries.js

@@ -1,13 +1,14 @@
 'use client';
 import { useContext } from 'react';
-import { useQueryClient, useSuspenseQueries as useSuspenseQueriesTanstack, } from '@tanstack/react-query';
+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';
 export const useSuspenseQueries = (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({
         ...options,
         queries: options.queries.map((queryOptions) => {
@@ -24,7 +25,7 @@ export const useSuspenseQueries = (qraftOptions, schema, args) => {
                 ...optionsWithQueryKey,
                 queryFn: optionsWithQueryKey.queryFn ??
                     function ({ queryKey: [, queryParams], signal, meta }) {
-                        return requestClient(schema, {
+                        return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
                             parameters: queryParams,
                             signal,
                             meta,
@@ -32,6 +33,6 @@ export const useSuspenseQueries = (qraftOptions, schema, args) => {
                     },
             };
         }),
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    }, useQueryClient(qraftOptions, queryClientByArg));
 };
 //# sourceMappingURL=useSuspenseQueries.js.map