@openapi-qraft/react 1.1.5 → 1.3.2

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?.requestFn)
+        throw new Error(`QraftContext.request not found`);
     const mutationKey = options && 'mutationKey' in options
         ? options.mutationKey
         : composeMutationKey(schema, parameters);
@@ -22,18 +23,20 @@ export const useMutation = (qraftOptions, schema, args) => {
         mutationFn: options?.mutationFn ??
             (parameters
                 ? function (bodyPayload) {
-                    return requestClient(schema, {
+                    return contextValue.requestFn(schema, {
                         parameters,
+                        baseUrl: contextValue.baseUrl,
                         body: bodyPayload,
                     });
                 }
                 : function (parametersAndBodyPayload) {
                     const { body, ...parameters } = parametersAndBodyPayload;
-                    return requestClient(schema, {
-                        body,
+                    return contextValue.requestFn(schema, {
                         parameters,
+                        baseUrl: contextValue.baseUrl,
+                        body,
                     });
                 }),
-    }, 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,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 { OperationSchema } from '../lib/requestFn.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: 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,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,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,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 { OperationSchema } from '../lib/requestFn.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: 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,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,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

@@ -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?.requestFn)
+        throw new Error(`QraftContext.requestFn not found`);
     return useQueriesTanstack({
         ...options,
         queries: options.queries.map((queryOptions) => {
@@ -16,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;
                 })()
@@ -24,14 +26,15 @@ export const useQueries = (qraftOptions, schema, args) => {
                 ...optionsWithQueryKey,
                 queryFn: optionsWithQueryKey.queryFn ??
                     function ({ queryKey: [, queryParams], signal, meta }) {
-                        return requestClient(schema, {
+                        return contextValue.requestFn(schema, {
                             parameters: queryParams,
+                            baseUrl: contextValue.baseUrl,
                             signal,
                             meta,
                         });
                     },
             };
         }),
-    }, 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,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 { UseQueryResult } from '@tanstack/react-query';
+import { type UseQueryResult } from '@tanstack/react-query';
+import type { OperationSchema } from '../lib/requestFn.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>;
+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,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":"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,27 +1,9 @@
 'use client';
-import { useContext } from 'react';
-import { useQuery as useQueryTanstack, useQueryClient, } from '@tanstack/react-query';
-import { composeQueryKey } from '../lib/composeQueryKey.js';
-import { QraftContext } from '../QraftContext.js';
+import { useQuery as useQueryTanstack, } from '@tanstack/react-query';
+import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.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 queryKey = Array.isArray(parameters)
-        ? parameters
-        : composeQueryKey(schema, parameters);
-    return useQueryTanstack({
-        ...options,
-        queryKey,
-        queryFn: options?.queryFn ??
-            function ({ queryKey: [, queryParams], signal, meta }) {
-                return requestClient(schema, {
-                    parameters: queryParams,
-                    signal,
-                    meta,
-                });
-            },
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    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,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;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 UseSuspenseInfiniteQueryResult } from '@tanstack/react-query';
+import type { OperationSchema } from '../lib/requestFn.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>;
+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,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":"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,28 +1,9 @@
 'use client';
-import { useContext } from 'react';
-import { useQueryClient, useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack, } from '@tanstack/react-query';
-import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
-import { shelfMerge } from '../lib/shelfMerge.js';
-import { QraftContext } from '../QraftContext.js';
+import { useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack, } from '@tanstack/react-query';
+import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.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 queryKey = Array.isArray(parameters)
-        ? parameters
-        : composeInfiniteQueryKey(schema, parameters);
-    return useSuspenseInfiniteQueryTanstack({
-        ...options,
-        queryKey,
-        queryFn: options?.queryFn ??
-            function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-                return requestClient(schema, {
-                    parameters: shelfMerge(2, queryParams, pageParam),
-                    signal,
-                    meta,
-                });
-            },
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    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,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;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 { OperationSchema } from '../lib/requestFn.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: 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,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,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

@@ -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?.requestFn)
+        throw new Error(`QraftContext.requestFn not found`);
     return useSuspenseQueriesTanstack({
         ...options,
         queries: options.queries.map((queryOptions) => {
@@ -16,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;
                 })()
@@ -24,14 +26,15 @@ export const useSuspenseQueries = (qraftOptions, schema, args) => {
                 ...optionsWithQueryKey,
                 queryFn: optionsWithQueryKey.queryFn ??
                     function ({ queryKey: [, queryParams], signal, meta }) {
-                        return requestClient(schema, {
+                        return contextValue.requestFn(schema, {
                             parameters: queryParams,
+                            baseUrl: contextValue.baseUrl,
                             signal,
                             meta,
                         });
                     },
             };
         }),
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    }, useQueryClient(qraftOptions, queryClientByArg));
 };
 //# sourceMappingURL=useSuspenseQueries.js.map

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,cAAc,EACd,kBAAkB,IAAI,0BAA0B,GACjD,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,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,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,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,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":"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 UseQueryResult } from '@tanstack/react-query';
+import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
-export declare const useSuspenseQuery: <TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, 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,EAEL,cAAc,EAEf,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,gBAAgB,EAAE,CAC7B,YAAY,GAAG,OAAO,EACtB,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,EAEpB,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,cAAc,CAAC,KAAK,EAAE,MAAM,CA6BhC,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"}

package/dist/callbacks/useSuspenseQuery.js

@@ -1,27 +1,9 @@
 'use client';
-import { useContext } from 'react';
-import { useQueryClient, useSuspenseQuery as useSuspenseQueryTanstack, } from '@tanstack/react-query';
-import { composeQueryKey } from '../lib/composeQueryKey.js';
-import { QraftContext } from '../QraftContext.js';
+import { useSuspenseQuery as useSuspenseQueryTanstack, } from '@tanstack/react-query';
+import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 export const useSuspenseQuery = (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 queryKey = Array.isArray(parameters)
-        ? parameters
-        : composeQueryKey(schema, parameters);
-    return useSuspenseQueryTanstack({
-        ...options,
-        queryKey,
-        queryFn: options?.queryFn ??
-            function ({ queryKey: [, queryParams], signal, meta }) {
-                return requestClient(schema, {
-                    parameters: queryParams,
-                    signal,
-                    meta,
-                });
-            },
-    }, useQueryClient(queryClientByArg ?? queryClientByContext));
+    return useSuspenseQueryTanstack(
+    // @ts-expect-error
+    ...useComposeUseQueryOptions(qraftOptions, schema, args, false));
 };
 //# sourceMappingURL=useSuspenseQuery.js.map

package/dist/callbacks/useSuspenseQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSuspenseQuery.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,cAAc,EAEd,gBAAgB,IAAI,wBAAwB,GAC7C,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,gBAAgB,GAcQ,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,UAAoB;QACvB,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE1C,OAAO,wBAAwB,CAC7B;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":"useSuspenseQuery.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,OAAO,EAEL,gBAAgB,IAAI,wBAAwB,GAC7C,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAIhF,MAAM,CAAC,MAAM,gBAAgB,GAUQ,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,OAAO,wBAAwB;IAC7B,mBAAmB;IACnB,GAAG,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CACvD,CAAC;AACb,CAAC,CAAC"}

package/dist/index.d.ts

@@ -1,9 +1,5 @@
-export { qraftAPIClient } from './qraftAPIClient.js';
-export type { QraftClientOptions } from './qraftAPIClient.js';
-export { QraftContext } from './QraftContext.js';
-export type { QraftContextValue } from './QraftContext.js';
-export { request, urlSerializer, bodySerializer } from './lib/request.js';
-export type { APIRequestInit, HeadersOptions } from './lib/request.js';
+export { qraftAPIClient, type QraftClientOptions } from './qraftAPIClient.js';
+export { QraftContext, type QraftContextValue } from './QraftContext.js';
+export { requestFn, baseRequestFn, urlSerializer, bodySerializer, type RequestFnPayload, type OperationSchema, type RequestFnOptions, type HeadersOptions, } from './lib/requestFn.js';
 export type { ServiceOperationQuery, ServiceOperationMutation, } from './ServiceOperation.js';
-export type { RequestClient } from './RequestClient.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC1E,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvE,YAAY,EACV,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EACL,SAAS,EACT,aAAa,EACb,aAAa,EACb,cAAc,EACd,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,cAAc,GACpB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EACV,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,uBAAuB,CAAC"}

package/dist/index.js

@@ -1,4 +1,4 @@
 export { qraftAPIClient } from './qraftAPIClient.js';
 export { QraftContext } from './QraftContext.js';
-export { request, urlSerializer, bodySerializer } from './lib/request.js';
+export { requestFn, baseRequestFn, urlSerializer, bodySerializer, } from './lib/requestFn.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA2B,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,YAAY,EAA0B,MAAM,mBAAmB,CAAC;AACzE,OAAO,EACL,SAAS,EACT,aAAa,EACb,aAAa,EACb,cAAc,GAKf,MAAM,oBAAoB,CAAC"}

package/dist/lib/callQueryClientFetchMethod.d.ts

@@ -0,0 +1,20 @@
+import type { QueryClient } from '@tanstack/query-core';
+import type { OperationSchema, RequestFn } from './requestFn.js';
+/**
+ * Calls a query client fetch method with parameters and options,
+ * and automatically composes the `QueryKey` based on the schema and parameters.
+ */
+export declare function callQueryClientMethodWithQueryKey<QFMethod extends QueryKeyMethods>(queryFilterMethod: QFMethod, schema: OperationSchema, infinite: boolean, args: QueryClientMethodArgs<QFMethod>): ReturnType<(typeof QueryClient.prototype)[QFMethod]>;
+type QueryClientMethodArgs<QMethod extends keyof QueryClientPrototype> = [
+    options: Parameters<QueryClientPrototype[QMethod]>[0] & {
+        parameters?: unknown;
+        baseUrl?: string;
+        requestFn?: RequestFn<unknown>;
+    },
+    queryClient: QueryClient
+];
+type QueryKeyMethods = QueryKeyMethod<'fetchQuery'> | QueryKeyMethod<'prefetchQuery'> | QueryKeyMethod<'fetchInfiniteQuery'> | QueryKeyMethod<'prefetchInfiniteQuery'>;
+type QueryClientPrototype = typeof QueryClient.prototype;
+type QueryKeyMethod<QFMethod extends keyof typeof QueryClient.prototype> = QFMethod;
+export {};
+//# sourceMappingURL=callQueryClientFetchMethod.d.ts.map

package/dist/lib/callQueryClientFetchMethod.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"callQueryClientFetchMethod.d.ts","sourceRoot":"","sources":["../../src/lib/callQueryClientFetchMethod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAIxD,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGjE;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,SAAS,eAAe,EAEhC,iBAAiB,EAAE,QAAQ,EAC3B,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,qBAAqB,CAAC,QAAQ,CAAC,GACpC,UAAU,CAAC,CAAC,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAmDtD;AAED,KAAK,qBAAqB,CAAC,OAAO,SAAS,MAAM,oBAAoB,IAAI;IACvE,OAAO,EAAE,UAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QACtD,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;KAChC;IACD,WAAW,EAAE,WAAW;CACzB,CAAC;AAEF,KAAK,eAAe,GAChB,cAAc,CAAC,YAAY,CAAC,GAC5B,cAAc,CAAC,eAAe,CAAC,GAC/B,cAAc,CAAC,oBAAoB,CAAC,GACpC,cAAc,CAAC,uBAAuB,CAAC,CAAC;AAE5C,KAAK,oBAAoB,GAAG,OAAO,WAAW,CAAC,SAAS,CAAC;AAEzD,KAAK,cAAc,CAAC,QAAQ,SAAS,MAAM,OAAO,WAAW,CAAC,SAAS,IACrE,QAAQ,CAAC"}

package/dist/lib/callQueryClientFetchMethod.js

@@ -0,0 +1,48 @@
+import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';
+import { composeQueryKey } from './composeQueryKey.js';
+import { shelfMerge } from './shelfMerge.js';
+/**
+ * Calls a query client fetch method with parameters and options,
+ * and automatically composes the `QueryKey` based on the schema and parameters.
+ */
+export function callQueryClientMethodWithQueryKey(queryFilterMethod, schema, infinite, args) {
+    const [{ requestFn, baseUrl, parameters, ...options }, queryClient] = args;
+    if (!queryClient)
+        throw new Error('queryClient is required');
+    if (!queryClient[queryFilterMethod])
+        throw new Error(`queryClient is invalid, ${queryFilterMethod} method does not exist`);
+    if (options.queryKey && parameters) {
+        throw new Error('callQueryClientMethodWithQueryKey: options.queryKey and options.parameters are mutually exclusive');
+    }
+    if (options.queryFn && requestFn) {
+        throw new Error('callQueryClientMethodWithQueryKey: options.queryFn and requestFn are mutually exclusive');
+    }
+    const queryFn = options.queryFn ??
+        (requestFn
+            ? // @ts-expect-error
+                function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
+                    return requestFn(schema, {
+                        parameters: infinite
+                            ? shelfMerge(2, queryParams, pageParam)
+                            : queryParams,
+                        baseUrl,
+                        signal,
+                        meta,
+                    });
+                }
+            : undefined);
+    if (parameters) {
+        // @ts-expect-error
+        return queryClient[queryFilterMethod]({
+            ...options,
+            // Event if queryFn is undefined, it will override the default queryFn from `setQueryDefaults(...)`
+            ...(queryFn ? { queryFn } : {}),
+            queryKey: infinite
+                ? composeInfiniteQueryKey(schema, parameters)
+                : composeQueryKey(schema, parameters),
+        });
+    }
+    // @ts-expect-error
+    return queryClient[queryFilterMethod]({ ...options, queryFn });
+}
+//# sourceMappingURL=callQueryClientFetchMethod.js.map

package/dist/lib/callQueryClientFetchMethod.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"callQueryClientFetchMethod.js","sourceRoot":"","sources":["../../src/lib/callQueryClientFetchMethod.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C;;;GAGG;AACH,MAAM,UAAU,iCAAiC,CAG/C,iBAA2B,EAC3B,MAAuB,EACvB,QAAiB,EACjB,IAAqC;IAErC,MAAM,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,EAAE,EAAE,WAAW,CAAC,GAAG,IAAI,CAAC;IAE3E,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7D,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,2BAA2B,iBAAiB,wBAAwB,CACrE,CAAC;IAEJ,IAAI,OAAO,CAAC,QAAQ,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACb,mGAAmG,CACpG,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GACX,OAAO,CAAC,OAAO;QACf,CAAC,SAAS;YACR,CAAC,CAAC,mBAAmB;gBACnB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;oBAC9D,OAAO,SAAS,CAAC,MAAM,EAAE;wBACvB,UAAU,EAAE,QAAQ;4BAClB,CAAC,CAAE,UAAU,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAW;4BAClD,CAAC,CAAC,WAAW;wBACf,OAAO;wBACP,MAAM;wBACN,IAAI;qBACL,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,SAAS,CAAC,CAAC;IAEjB,IAAI,UAAU,EAAE,CAAC;QACf,mBAAmB;QACnB,OAAO,WAAW,CAAC,iBAAiB,CAAC,CAAC;YACpC,GAAG,OAAO;YACV,mGAAmG;YACnG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,QAAQ,EAAE,QAAQ;gBAChB,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,CAAC;gBAC7C,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC;SACxC,CAAC,CAAC;IACL,CAAC;IAED,mBAAmB;IACnB,OAAO,WAAW,CAAC,iBAAiB,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;AACjE,CAAC"}

package/dist/lib/callQueryClientMethodWithQueryFilters.d.ts

@@ -1,10 +1,10 @@
 import type { QueryClient } from '@tanstack/query-core';
-import type { RequestClientSchema } from '../RequestClient.js';
+import type { OperationSchema } from './requestFn.js';
 /**
  * Calls a query client method with query filters and options,
  * and automatically composes the `QueryKey` based on the schema and parameters.
  */
-export declare function callQueryClientMethodWithQueryFilters<QFMethod extends QueryFilterMethods>(queryFilterMethod: QFMethod, schema: RequestClientSchema, args: [QueryClient, ...Parameters<(typeof QueryClient.prototype)[QFMethod]>]): ReturnType<(typeof QueryClient.prototype)[QFMethod]>;
+export declare function callQueryClientMethodWithQueryFilters<QFMethod extends QueryFilterMethods>(queryFilterMethod: QFMethod, schema: OperationSchema, args: [...Parameters<(typeof QueryClient.prototype)[QFMethod]>, QueryClient]): ReturnType<(typeof QueryClient.prototype)[QFMethod]>;
 type QueryFiltersMethod<QFMethod extends keyof typeof QueryClient.prototype> = QFMethod;
 type QueryFilterMethods = QueryFiltersMethod<'isFetching'> | QueryFiltersMethod<'getQueriesData'> | QueryFiltersMethod<'setQueriesData'> | QueryFiltersMethod<'removeQueries'> | QueryFiltersMethod<'resetQueries'> | QueryFiltersMethod<'cancelQueries'> | QueryFiltersMethod<'invalidateQueries'> | QueryFiltersMethod<'refetchQueries'>;
 export {};

package/dist/lib/callQueryClientMethodWithQueryFilters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callQueryClientMethodWithQueryFilters.d.ts","sourceRoot":"","sources":["../../src/lib/callQueryClientMethodWithQueryFilters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG/D;;;GAGG;AACH,wBAAgB,qCAAqC,CACnD,QAAQ,SAAS,kBAAkB,EAEnC,iBAAiB,EAAE,QAAQ,EAC3B,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG,UAAU,CAAC,CAAC,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAC3E,UAAU,CAAC,CAAC,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CA6BtD;AAED,KAAK,kBAAkB,CAAC,QAAQ,SAAS,MAAM,OAAO,WAAW,CAAC,SAAS,IACzE,QAAQ,CAAC;AAEX,KAAK,kBAAkB,GACnB,kBAAkB,CAAC,YAAY,CAAC,GAChC,kBAAkB,CAAC,gBAAgB,CAAC,GACpC,kBAAkB,CAAC,gBAAgB,CAAC,GACpC,kBAAkB,CAAC,eAAe,CAAC,GACnC,kBAAkB,CAAC,cAAc,CAAC,GAClC,kBAAkB,CAAC,eAAe,CAAC,GACnC,kBAAkB,CAAC,mBAAmB,CAAC,GACvC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"callQueryClientMethodWithQueryFilters.d.ts","sourceRoot":"","sources":["../../src/lib/callQueryClientMethodWithQueryFilters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD;;;GAGG;AACH,wBAAgB,qCAAqC,CACnD,QAAQ,SAAS,kBAAkB,EAEnC,iBAAiB,EAAE,QAAQ,EAC3B,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,WAAW,CAAC,GAC3E,UAAU,CAAC,CAAC,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAgBtD;AAED,KAAK,kBAAkB,CAAC,QAAQ,SAAS,MAAM,OAAO,WAAW,CAAC,SAAS,IACzE,QAAQ,CAAC;AAEX,KAAK,kBAAkB,GACnB,kBAAkB,CAAC,YAAY,CAAC,GAChC,kBAAkB,CAAC,gBAAgB,CAAC,GACpC,kBAAkB,CAAC,gBAAgB,CAAC,GACpC,kBAAkB,CAAC,eAAe,CAAC,GACnC,kBAAkB,CAAC,cAAc,CAAC,GAClC,kBAAkB,CAAC,eAAe,CAAC,GACnC,kBAAkB,CAAC,mBAAmB,CAAC,GACvC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC"}