@openapi-qraft/react 1.2.0 → 1.4.0

package/dist/callbacks/setInfiniteQueryData.js

@@ -1,9 +1,5 @@
-import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
+import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 export function setInfiniteQueryData(qraftOptions, schema, args) {
-    const [parameters, updater, queryClient, options] = args;
-    const queryKey = Array.isArray(parameters)
-        ? parameters
-        : composeInfiniteQueryKey(schema, parameters);
-    return queryClient.setQueryData(queryKey, updater, options);
+    return callQueryClientMethodWithQueryKey('setQueryData', schema, true, args);
 }
 //# sourceMappingURL=setInfiniteQueryData.js.map

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,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"}
+{"version":3,"file":"setInfiniteQueryData.js","sourceRoot":"","sources":["../../src/callbacks/setInfiniteQueryData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,6CAA6C,CAAC;AAKhG,MAAM,UAAU,oBAAoB,CAClC,YAA4C,EAC5C,MAAuB,EACvB,IAMC;IAED,OAAO,iCAAiC,CACtC,cAAc,EACd,MAAM,EACN,IAAI,EACJ,IAAa,CACL,CAAC;AACb,CAAC"}

package/dist/callbacks/setQueryData.d.ts

@@ -1,5 +1,5 @@
-import type { OperationRequestSchema } from '../lib/request.js';
+import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
-export declare function setQueryData<TData>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, TData>['setQueryData']>): TData | undefined;
+import type { ServiceOperationSetQueryDataCallback } from '../ServiceOperation.js';
+export declare function setQueryData<TData>(_: QraftClientOptions | undefined, schema: OperationSchema, args: Parameters<ServiceOperationSetQueryDataCallback<OperationSchema, 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,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"}
+{"version":3,"file":"setQueryData.d.ts","sourceRoot":"","sources":["../../src/callbacks/setQueryData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,wBAAwB,CAAC;AAEnF,wBAAgB,YAAY,CAAC,KAAK,EAChC,CAAC,EAAE,kBAAkB,GAAG,SAAS,EACjC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,oCAAoC,CAClC,eAAe,EACf,OAAO,EACP,KAAK,CACN,CAAC,cAAc,CAAC,CAClB,GACA,KAAK,GAAG,SAAS,CAOnB"}

package/dist/callbacks/setQueryData.js

@@ -1,9 +1,5 @@
-import { composeQueryKey } from '../lib/composeQueryKey.js';
-export function setQueryData(qraftOptions, schema, args) {
-    const [parameters, updater, queryClient, options] = args;
-    const queryKey = Array.isArray(parameters)
-        ? parameters
-        : composeQueryKey(schema, parameters);
-    return queryClient.setQueryData(queryKey, updater, options);
+import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
+export function setQueryData(_, schema, args) {
+    return callQueryClientMethodWithQueryKey('setQueryData', schema, false, args);
 }
 //# sourceMappingURL=setQueryData.js.map

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,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"}
+{"version":3,"file":"setQueryData.js","sourceRoot":"","sources":["../../src/callbacks/setQueryData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,6CAA6C,CAAC;AAKhG,MAAM,UAAU,YAAY,CAC1B,CAAiC,EACjC,MAAuB,EACvB,IAMC;IAED,OAAO,iCAAiC,CACtC,cAAc,EACd,MAAM,EACN,KAAK,EACL,IAAa,CACL,CAAC;AACb,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 UseInfiniteQueryResult } from '@tanstack/react-query';
+import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
-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>;
+import type { ServiceOperationQuery } from '../ServiceOperation.js';
+export declare const useInfiniteQuery: <TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>>(qraftOptions: QraftClientOptions | undefined, schema: OperationSchema, args: Parameters<ServiceOperationQuery<OperationSchema, 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,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"}
+{"version":3,"file":"useInfiniteQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useInfiniteQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAEpE,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,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAC7E,KACE,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAKxC,CAAC"}

package/dist/callbacks/useInfiniteQuery.js

@@ -1,29 +1,9 @@
 'use client';
-import { useContext } from 'react';
 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';
+import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 export const useInfiniteQuery = (qraftOptions, schema, args) => {
-    const [parameters, options, queryClientByArg] = args;
-    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);
-    return useInfiniteQueryBase({
-        ...options,
-        queryKey,
-        queryFn: options?.queryFn ??
-            function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-                return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
-                    parameters: shelfMerge(2, queryParams, pageParam),
-                    signal,
-                    meta,
-                });
-            },
-    }, useQueryClient(qraftOptions, queryClientByArg));
+    return useInfiniteQueryBase(
+    // @ts-expect-error
+    ...useComposeUseQueryOptions(qraftOptions, schema, args, true));
 };
 //# 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,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"}
+{"version":3,"file":"useInfiniteQuery.js","sourceRoot":"","sources":["../../src/callbacks/useInfiniteQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,OAAO,EACL,gBAAgB,IAAI,oBAAoB,GAEzC,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAIhF,MAAM,CAAC,MAAM,gBAAgB,GAUgB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAC1E,OAAO,oBAAoB;IACzB,mBAAmB;IACnB,GAAG,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CACtD,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useIsFetching.d.ts

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

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

@@ -1 +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"}
+{"version":3,"file":"useIsFetching.d.ts","sourceRoot":"","sources":["../../src/callbacks/useIsFetching.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,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,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,eAAe,EACf,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,OAAO,CACR,CAAC,eAAe,CAAC,CACnB,KACE,MAOJ,CAAC"}

package/dist/callbacks/useIsFetching.js

@@ -4,9 +4,6 @@ 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

@@ -1 +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"}
+{"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,OAAO,qBAAqB,CAC1B,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAU,EAC7C,cAAc,CAAC,YAAY,EAAE,gBAAgB,CAAC,CACtC,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useIsMutating.d.ts

@@ -0,0 +1,7 @@
+import type { DefaultError } from '@tanstack/query-core';
+import { UseMutationResult } from '@tanstack/react-query';
+import type { OperationSchema } from '../lib/requestFn.js';
+import type { QraftClientOptions } from '../qraftAPIClient.js';
+import { ServiceOperationMutation } from '../ServiceOperation.js';
+export declare const useIsMutating: <TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown>(_: QraftClientOptions | undefined, schema: OperationSchema, args: Parameters<ServiceOperationMutation<OperationSchema, object | undefined, TVariables, TData>['useIsMutating']>) => UseMutationResult<TData, TError, TVariables, TContext>;
+//# sourceMappingURL=useIsMutating.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useIsMutating.d.ts","sourceRoot":"","sources":["../../src/callbacks/useIsMutating.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,iBAAiB,EAElB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,eAAO,MAAM,aAAa,EAAE,CAC1B,KAAK,GAAG,OAAO,EACf,MAAM,GAAG,YAAY,EACrB,UAAU,GAAG,OAAO,EACpB,QAAQ,GAAG,OAAO,EAElB,CAAC,EAAE,kBAAkB,GAAG,SAAS,EACjC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,eAAe,EACf,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,eAAe,CAAC,CACnB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAWzD,CAAC"}

package/dist/callbacks/useIsMutating.js

@@ -0,0 +1,9 @@
+'use client';
+import { useIsMutating as useIsMutatingStateTanstack, } from '@tanstack/react-query';
+import { composeMutationFilters } from '../lib/composeMutationFilters.js';
+import { useQueryClient } from '../lib/useQueryClient.js';
+export const useIsMutating = (qraftOptions, schema, args) => {
+    const [filters, queryClientByArg] = args;
+    return useIsMutatingStateTanstack(composeMutationFilters(schema, filters), useQueryClient(qraftOptions, queryClientByArg));
+};
+//# sourceMappingURL=useIsMutating.js.map

package/dist/callbacks/useIsMutating.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useIsMutating.js","sourceRoot":"","sources":["../../src/callbacks/useIsMutating.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,OAAO,EAEL,aAAa,IAAI,0BAA0B,GAC5C,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,MAAM,CAAC,MAAM,aAAa,GAgBoC,CAC5D,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,OAAO,0BAA0B,CAC/B,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAU,EAChD,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 { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { ServiceOperationMutation } from '../ServiceOperation.js';
-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>;
+export declare const useMutation: <TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown>(qraftOptions: QraftClientOptions | undefined, schema: OperationSchema, args: Parameters<ServiceOperationMutation<OperationSchema, 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,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"}
+{"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,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,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,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,eAAe,EACf,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,aAAa,CAAC,CACjB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAyDzD,CAAC"}

package/dist/callbacks/useMutation.js

@@ -12,7 +12,7 @@ export const useMutation = (qraftOptions, schema, args) => {
         'mutationKey' in options)
         throw new Error(`'useMutation': parameters and 'options.mutationKey' cannot be used together`);
     const contextValue = useContext(qraftOptions?.context ?? QraftContext);
-    if (!contextValue?.request)
+    if (!contextValue?.requestFn)
         throw new Error(`QraftContext.request not found`);
     const mutationKey = options && 'mutationKey' in options
         ? options.mutationKey
@@ -23,16 +23,18 @@ export const useMutation = (qraftOptions, schema, args) => {
         mutationFn: options?.mutationFn ??
             (parameters
                 ? function (bodyPayload) {
-                    return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
+                    return contextValue.requestFn(schema, {
                         parameters,
+                        baseUrl: contextValue.baseUrl,
                         body: bodyPayload,
                     });
                 }
                 : function (parametersAndBodyPayload) {
                     const { body, ...parameters } = parametersAndBodyPayload;
-                    return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
-                        body,
+                    return contextValue.requestFn(schema, {
                         parameters,
+                        baseUrl: contextValue.baseUrl,
+                        body,
                     });
                 }),
     }, useQueryClient(qraftOptions, queryClientByArg));

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,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"}
+{"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,SAAS;QAC1B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAEpD,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,SAAS,CAAC,MAAM,EAAE;wBACpC,UAAU;wBACV,OAAO,EAAE,YAAY,CAAC,OAAO;wBAC7B,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,YAAY,CAAC,SAAS,CAAC,MAAM,EAAE;wBACpC,UAAU;wBACV,OAAO,EAAE,YAAY,CAAC,OAAO;wBAC7B,IAAI;qBACI,CAAC,CAAC;gBACd,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 { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { ServiceOperationMutation } from '../ServiceOperation.js';
-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>;
+export declare const useMutationState: <TData = unknown, TError = DefaultError, TVariables = unknown, TContext = unknown>(qraftOptions: QraftClientOptions | undefined, schema: OperationSchema, args: Parameters<ServiceOperationMutation<OperationSchema, 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,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"}
+{"version":3,"file":"useMutationState.d.ts","sourceRoot":"","sources":["../../src/callbacks/useMutationState.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,iBAAiB,EAElB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,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,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,eAAe,EACf,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,kBAAkB,CAAC,CACtB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAczD,CAAC"}

package/dist/callbacks/useMutationState.js

@@ -1,25 +1,12 @@
 'use client';
 import { useMutationState as useMutationStateTanstack, } from '@tanstack/react-query';
-import { composeMutationKey } from '../lib/composeMutationKey.js';
+import { composeMutationFilters } from '../lib/composeMutationFilters.js';
 import { useQueryClient } from '../lib/useQueryClient.js';
 export const useMutationState = (qraftOptions, schema, args) => {
     const [options, queryClientByArg] = args;
-    if (options?.filters &&
-        'parameters' in options.filters &&
-        'mutationKey' in options.filters) {
-        throw new Error(`'useMutationState': 'parameters' and 'mutationKey' cannot be used together`);
-    }
-    const filters = options?.filters;
     return useMutationStateTanstack({
         ...options,
-        filters: filters && 'mutationKey' in filters
-            ? filters
-            : {
-                ...filters,
-                mutationKey: composeMutationKey(schema, filters && 'parameters' in filters
-                    ? filters.parameters
-                    : undefined),
-            },
+        filters: composeMutationFilters(schema, options?.filters),
     }, 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;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"}
+{"version":3,"file":"useMutationState.js","sourceRoot":"","sources":["../../src/callbacks/useMutationState.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,OAAO,EAEL,gBAAgB,IAAI,wBAAwB,GAC7C,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE1E,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,OAAO,wBAAwB,CAC7B;QACE,GAAG,OAAO;QACV,OAAO,EAAE,sBAAsB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC;KACjD,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 { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { ServiceOperationQuery } from '../ServiceOperation.js';
-export declare const useQueries: (qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, unknown>['useQueries']>) => QueriesResults<never>;
+export declare const useQueries: (qraftOptions: QraftClientOptions | undefined, schema: OperationSchema, args: Parameters<ServiceOperationQuery<OperationSchema, 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,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"}
+{"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,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,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,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,YAAY,CAAC,CACvE,KACE,cAAc,CAAC,KAAK,CA2CxB,CAAC"}

package/dist/callbacks/useQueries.js

@@ -7,8 +7,8 @@ import { QraftContext } from '../QraftContext.js';
 export const useQueries = (qraftOptions, schema, args) => {
     const [options, queryClientByArg] = args;
     const contextValue = useContext(qraftOptions?.context ?? QraftContext);
-    if (!contextValue?.request)
-        throw new Error(`QraftContext.request not found`);
+    if (!contextValue?.requestFn)
+        throw new Error(`QraftContext.requestFn not found`);
     return useQueriesTanstack({
         ...options,
         queries: options.queries.map((queryOptions) => {
@@ -17,6 +17,7 @@ export const useQueries = (qraftOptions, schema, args) => {
                     const queryOptionsCopy = Object.assign({
                         queryKey: composeQueryKey(schema, queryOptions.parameters),
                     }, queryOptions);
+                    // @ts-expect-error
                     delete queryOptionsCopy.parameters;
                     return queryOptionsCopy;
                 })()
@@ -25,8 +26,9 @@ export const useQueries = (qraftOptions, schema, args) => {
                 ...optionsWithQueryKey,
                 queryFn: optionsWithQueryKey.queryFn ??
                     function ({ queryKey: [, queryParams], signal, meta }) {
-                        return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
+                        return contextValue.requestFn(schema, {
                             parameters: queryParams,
+                            baseUrl: contextValue.baseUrl,
                             signal,
                             meta,
                         });

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,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"}
+{"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,GAMM,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,SAAS;QAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAEtD,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,mBAAmB;oBACnB,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,SAAS,CAAC,MAAM,EAAE;4BACpC,UAAU,EAAE,WAAoB;4BAChC,OAAO,EAAE,YAAY,CAAC,OAAO;4BAC7B,MAAM;4BACN,IAAI;yBACL,CAAC,CAAC;oBACL,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 { type UseQueryResult } from '@tanstack/react-query';
-import type { OperationRequestSchema } from '../lib/request.js';
+import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
-export declare const useQuery: <TData = unknown, TError = DefaultError>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, unknown>['useQuery']>) => UseQueryResult<TData, TError>;
+import type { ServiceOperationQuery } from '../ServiceOperation.js';
+export declare const useQuery: <TData = unknown, TError = DefaultError>(qraftOptions: QraftClientOptions | undefined, schema: OperationSchema, args: Parameters<ServiceOperationQuery<OperationSchema, 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,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"}
+{"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAEpE,eAAO,MAAM,QAAQ,EAAE,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,YAAY,EAC5D,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,UAAU,CAAC,CACrE,KACE,cAAc,CAAC,KAAK,EAAE,MAAM,CAKhC,CAAC"}

package/dist/callbacks/useQuery.js

@@ -1,28 +1,9 @@
 'use client';
-import { useContext } from 'react';
 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';
+import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 export const useQuery = (qraftOptions, schema, args) => {
-    const [parameters, options, queryClientByArg] = args;
-    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);
-    return useQueryTanstack({
-        ...options,
-        queryKey,
-        queryFn: options?.queryFn ??
-            function ({ queryKey: [, queryParams], signal, meta }) {
-                return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
-                    parameters: queryParams,
-                    signal,
-                    meta,
-                });
-            },
-    }, useQueryClient(qraftOptions, queryClientByArg));
+    return useQueryTanstack(
+    // @ts-expect-error
+    ...useComposeUseQueryOptions(qraftOptions, schema, args, false));
 };
 //# 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,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"}
+{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/callbacks/useQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,OAAO,EACL,QAAQ,IAAI,gBAAgB,GAE7B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAIhF,MAAM,CAAC,MAAM,QAAQ,GAMgB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,OAAO,gBAAgB;IACrB,mBAAmB;IACnB,GAAG,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CACvD,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 UseSuspenseInfiniteQueryResult } from '@tanstack/react-query';
+import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
-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>;
+import type { ServiceOperationQuery } from '../ServiceOperation.js';
+export declare const useSuspenseInfiniteQuery: <TQueryFnData, TError = DefaultError, TData = InfiniteData<TQueryFnData>>(qraftOptions: QraftClientOptions | undefined, schema: OperationSchema, args: Parameters<ServiceOperationQuery<OperationSchema, 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,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"}
+{"version":3,"file":"useSuspenseInfiniteQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseInfiniteQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAEpE,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,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,eAAe,EACf,OAAO,EACP,OAAO,CACR,CAAC,0BAA0B,CAAC,CAC9B,KACE,8BAA8B,CAAC,KAAK,EAAE,MAAM,CAShD,CAAC"}

package/dist/callbacks/useSuspenseInfiniteQuery.js

@@ -1,29 +1,9 @@
 'use client';
-import { useContext } from 'react';
 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';
+import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 export const useSuspenseInfiniteQuery = (qraftOptions, schema, args) => {
-    const [parameters, options, queryClientByArg] = args;
-    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);
-    return useSuspenseInfiniteQueryTanstack({
-        ...options,
-        queryKey,
-        queryFn: options?.queryFn ??
-            function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-                return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
-                    parameters: shelfMerge(2, queryParams, pageParam),
-                    signal,
-                    meta,
-                });
-            },
-    }, useQueryClient(qraftOptions, queryClientByArg));
+    return useSuspenseInfiniteQueryTanstack(
+    // @ts-expect-error
+    ...useComposeUseQueryOptions(qraftOptions, schema, args, true));
 };
 //# 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,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"}
+{"version":3,"file":"useSuspenseInfiniteQuery.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseInfiniteQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,OAAO,EACL,wBAAwB,IAAI,gCAAgC,GAE7D,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAIhF,MAAM,CAAC,MAAM,wBAAwB,GAcgB,CACnD,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,OAAO,gCAAgC;IACrC,mBAAmB;IACnB,GAAG,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CACtD,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 { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { ServiceOperationQuery } from '../ServiceOperation.js';
-export declare const useSuspenseQueries: (qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, unknown>['useSuspenseQueries']>) => SuspenseQueriesResults<never>;
+export declare const useSuspenseQueries: (qraftOptions: QraftClientOptions | undefined, schema: OperationSchema, args: Parameters<ServiceOperationQuery<OperationSchema, 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,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"}
+{"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,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,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,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,eAAe,EACf,OAAO,EACP,OAAO,CACR,CAAC,oBAAoB,CAAC,CACxB,KACE,sBAAsB,CAAC,KAAK,CA2ChC,CAAC"}

package/dist/callbacks/useSuspenseQueries.js

@@ -7,8 +7,8 @@ import { QraftContext } from '../QraftContext.js';
 export const useSuspenseQueries = (qraftOptions, schema, args) => {
     const [options, queryClientByArg] = args;
     const contextValue = useContext(qraftOptions?.context ?? QraftContext);
-    if (!contextValue?.request)
-        throw new Error(`QraftContext.request not found`);
+    if (!contextValue?.requestFn)
+        throw new Error(`QraftContext.requestFn not found`);
     return useSuspenseQueriesTanstack({
         ...options,
         queries: options.queries.map((queryOptions) => {
@@ -17,6 +17,7 @@ export const useSuspenseQueries = (qraftOptions, schema, args) => {
                     const queryOptionsCopy = Object.assign({
                         queryKey: composeQueryKey(schema, queryOptions.parameters),
                     }, queryOptions);
+                    // @ts-expect-error
                     delete queryOptionsCopy.parameters;
                     return queryOptionsCopy;
                 })()
@@ -25,8 +26,9 @@ export const useSuspenseQueries = (qraftOptions, schema, args) => {
                 ...optionsWithQueryKey,
                 queryFn: optionsWithQueryKey.queryFn ??
                     function ({ queryKey: [, queryParams], signal, meta }) {
-                        return contextValue.request({ baseUrl: contextValue.baseUrl }, schema, {
+                        return contextValue.requestFn(schema, {
                             parameters: queryParams,
+                            baseUrl: contextValue.baseUrl,
                             signal,
                             meta,
                         });

package/dist/callbacks/useSuspenseQueries.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSuspenseQueries.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQueries.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAEL,kBAAkB,IAAI,0BAA0B,GACjD,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,kBAAkB,GAUM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,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,0BAA0B,CAC/B;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"}
+{"version":3,"file":"useSuspenseQueries.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQueries.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAEL,kBAAkB,IAAI,0BAA0B,GACjD,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,kBAAkB,GAUM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,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,SAAS;QAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAEtD,OAAO,0BAA0B,CAC/B;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,mBAAmB;oBACnB,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,SAAS,CAAC,MAAM,EAAE;4BACpC,UAAU,EAAE,WAAoB;4BAChC,OAAO,EAAE,YAAY,CAAC,OAAO;4BAC7B,MAAM;4BACN,IAAI;yBACL,CAAC,CAAC;oBACL,CAAC;aACJ,CAAC;QACJ,CAAC,CAAC;KACH,EACD,cAAc,CAAC,YAAY,EAAE,gBAAgB,CAAC,CACtC,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useSuspenseQuery.d.ts

@@ -1,7 +1,7 @@
 import type { DefaultError } from '@tanstack/query-core';
-import { UseQueryResult } from '@tanstack/react-query';
-import type { OperationRequestSchema } from '../lib/request.js';
+import { type UseQueryResult } from '@tanstack/react-query';
+import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
-export declare const useSuspenseQuery: <TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData>(qraftOptions: QraftClientOptions | undefined, schema: OperationRequestSchema, args: Parameters<ServiceOperationQuery<OperationRequestSchema, unknown, unknown>['useSuspenseQuery']>) => UseQueryResult<TData, TError>;
+import type { ServiceOperationQuery } from '../ServiceOperation.js';
+export declare const useSuspenseQuery: <TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData>(qraftOptions: QraftClientOptions | undefined, schema: OperationSchema, args: Parameters<ServiceOperationQuery<OperationSchema, unknown, unknown>['useSuspenseQuery']>) => UseQueryResult<TData, TError>;
 //# sourceMappingURL=useSuspenseQuery.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useSuspenseQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,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,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,gBAAgB,EAAE,CAC7B,YAAY,GAAG,OAAO,EACtB,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,EAEpB,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,cAAc,CAAC,KAAK,EAAE,MAAM,CA+BhC,CAAC"}
+{"version":3,"file":"useSuspenseQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,KAAK,cAAc,EAEpB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAEpE,eAAO,MAAM,gBAAgB,EAAE,CAC7B,YAAY,GAAG,OAAO,EACtB,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,EAEpB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAC7E,KACE,cAAc,CAAC,KAAK,EAAE,MAAM,CAKhC,CAAC"}