@openapi-qraft/react 1.7.0 → 1.8.0

package/dist/lib/useQueryClient.js

@@ -8,8 +8,7 @@ import { QraftContext } from '../QraftContext.js';
  * @param queryClient If not provided, will be taken this instance
  */
 export function useQueryClient(qraftOptions, queryClient) {
-    const queryClientByContext = useContext(qraftOptions?.context ?? QraftContext)
-        ?.queryClient;
+    const queryClientByContext = useContext(qraftOptions?.context ?? QraftContext)?.queryClient;
     return useQueryClientTanstack(queryClient ?? queryClientByContext);
 }
 //# sourceMappingURL=useQueryClient.js.map

package/dist/lib/useQueryClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"useQueryClient.js","sourceRoot":"","sources":["../../src/lib/useQueryClient.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAEL,cAAc,IAAI,sBAAsB,GACzC,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAC5B,YAA4C,EAC5C,WAAoC;IAEpC,MAAM,oBAAoB,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC;QAC5E,EAAE,WAAW,CAAC;IAEhB,OAAO,sBAAsB,CAAC,WAAW,IAAI,oBAAoB,CAAC,CAAC;AACrE,CAAC"}
+{"version":3,"file":"useQueryClient.js","sourceRoot":"","sources":["../../src/lib/useQueryClient.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAEL,cAAc,IAAI,sBAAsB,GACzC,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAC5B,YAA4C,EAC5C,WAAoC;IAEpC,MAAM,oBAAoB,GAAG,UAAU,CACrC,YAAY,EAAE,OAAO,IAAI,YAAY,CACtC,EAAE,WAAW,CAAC;IAEf,OAAO,sBAAsB,CAAC,WAAW,IAAI,oBAAoB,CAAC,CAAC;AACrE,CAAC"}

package/dist/qraftAPIClient.d.ts

@@ -4,33 +4,21 @@ import type { QraftContextValue } from './QraftContext.js';
 export interface QraftClientOptions {
     context?: Context<QraftContextValue>;
 }
-export declare const qraftAPIClient: <Services extends ServicesOutput<Services>, Callbacks extends ServicesCallbacks>(services: ServicesDeclaration<Services>, callbacks: Callbacks, options?: QraftClientOptions) => ServicesCallbacksFilter<Services, keyof Callbacks>;
-type ServicesOutput<Services> = {
+export declare const qraftAPIClient: <Services extends ServicesBaseDeclaration<Services>, Callbacks extends ServicesCallbacks>(services: ServicesDeclaration<Services>, callbacks: Callbacks, options?: QraftClientOptions) => Services;
+type ServicesBaseDeclaration<Services> = {
     [service in keyof Services]: {
         [method in keyof Services[service]]: {
             schema: OperationSchema;
         };
     };
 };
-type ServicesDeclaration<Services extends ServicesOutput<Services>> = {
+type ServicesDeclaration<Services extends ServicesBaseDeclaration<Services>> = {
     [service in keyof Services]: {
         [method in keyof Services[service]]: {
             schema: Services[service][method]['schema'];
         };
     };
 };
-type ServicesCallbacks = Record<string, (...rest: any[]) => any>;
-type ServicesCallbacksFilter<Services extends ServicesOutput<Services>, Callbacks> = Services extends {
-    [serviceName in keyof Services]: {
-        [method in keyof Services[serviceName]]: {
-            schema: OperationSchema;
-        };
-    };
-} ? {
-    [serviceName in keyof Services]: {
-        [method in keyof Services[serviceName]]: Pick<Services[serviceName][method], FilterKeys<keyof Services[serviceName][method], Callbacks | 'schema' | 'types'>>;
-    };
-} : never;
-type FilterKeys<T, K> = K extends T ? K : never;
+type ServicesCallbacks = Record<string, (...rest: any[]) => unknown>;
 export {};
 //# sourceMappingURL=qraftAPIClient.d.ts.map

package/dist/qraftAPIClient.d.ts.map

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

package/dist/qraftAPIClient.js

@@ -1,24 +1,43 @@
 import { createRecursiveProxy } from './lib/createRecursiveProxy.js';
 export const qraftAPIClient = (services, callbacks, options) => {
-    return createRecursiveProxy((getPath, key) => {
+    return createRecursiveProxy(function getCallback(getPath, key) {
         if (getPath.length !== 2 || key !== 'schema')
-            return;
+            return; // todo::maybe return callback?
         const serviceOperation = getByPath(services, getPath);
         if (!isServiceOperation(serviceOperation))
             throw new Error(`Service operation not found: ${getPath.join('.')}`);
         return serviceOperation.schema;
-    }, (applyPath, args) => {
-        const path = applyPath.slice(0, -1);
+    }, function applyCallback(applyPath, args) {
+        const { path, callbackName } = extractCallbackDetails(applyPath);
+        if (!(callbackName in callbacks))
+            throw new Error(`Function ${callbackName} is not supported`);
         const serviceOperation = getByPath(services, path);
         if (!isServiceOperation(serviceOperation))
             throw new Error(`Service operation not found: ${path.join('.')}`);
-        // The last arg is for instance `.useMutation` or `.useQuery()`
-        const functionName = applyPath[applyPath.length - 1];
-        if (!(functionName in callbacks))
-            throw new Error(`Function ${functionName} is not supported`);
-        return callbacks[functionName](options, serviceOperation.schema, args);
+        return callbacks[callbackName](options, serviceOperation.schema, args);
     }, []);
 };
+/**
+ * Extracts Callback details from the applyPath
+ * @param applyPath
+ */
+function extractCallbackDetails(applyPath) {
+    // <service>.<operation>()
+    if (applyPath.length === 2) {
+        return {
+            path: applyPath,
+            callbackName: 'operationInvokeFn',
+        };
+    }
+    else {
+        // <service>.<operation>.<method>()
+        return {
+            path: applyPath.slice(0, -1),
+            // The last arg is for instance `.useMutation` or `.useQuery()`
+            callbackName: applyPath[applyPath.length - 1],
+        };
+    }
+}
 function isServiceOperation(input) {
     return input !== null && typeof input === 'object' && 'schema' in input;
 }

package/dist/qraftAPIClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"qraftAPIClient.js","sourceRoot":"","sources":["../src/qraftAPIClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAQrE,MAAM,CAAC,MAAM,cAAc,GAAG,CAI5B,QAAuC,EACvC,SAAoB,EACpB,OAA4B,EACwB,EAAE;IACtD,OAAO,oBAAoB,CACzB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;QACf,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,KAAK,QAAQ;YAAE,OAAO;QAErD,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,gCAAgC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvE,OAAO,gBAAgB,CAAC,MAAM,CAAC;IACjC,CAAC,EACD,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE;QAClB,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAEnD,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpE,+DAA+D;QAC/D,MAAM,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAErD,IAAI,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,YAAY,YAAY,mBAAmB,CAAC,CAAC;QAE/D,OAAO,SAAS,CAAC,YAA+B,CAAC,CAC/C,OAAO,EACP,gBAAgB,CAAC,MAAM,EACvB,IAAI,CACL,CAAC;IACJ,CAAC,EACD,EAAE,CACM,CAAC;AACb,CAAC,CAAC;AAEF,SAAS,kBAAkB,CACzB,KAAc;IAEd,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,QAAQ,IAAI,KAAK,CAAC;AAC1E,CAAC;AAED,SAAS,SAAS,CAAC,GAA4B,EAAE,IAAc;IAC7D,OAAO,IAAI,CAAC,MAAM,CAAU,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvC,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,IAAI,GAAG;YAC9C,OAAO,GAAG,CAAC,GAAuB,CAAC,CAAC;IACxC,CAAC,EAAE,GAAG,CAAC,CAAC;AACV,CAAC"}
+{"version":3,"file":"qraftAPIClient.js","sourceRoot":"","sources":["../src/qraftAPIClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAQrE,MAAM,CAAC,MAAM,cAAc,GAAG,CAI5B,QAAuC,EACvC,SAAoB,EACpB,OAA4B,EAClB,EAAE;IACZ,OAAO,oBAAoB,CACzB,SAAS,WAAW,CAAC,OAAO,EAAE,GAAG;QAC/B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,KAAK,QAAQ;YAAE,OAAO,CAAC,+BAA+B;QAErF,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,gCAAgC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvE,OAAO,gBAAgB,CAAC,MAAM,CAAC;IACjC,CAAC,EACD,SAAS,aAAa,CAAC,SAAS,EAAE,IAAI;QACpC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAEjE,IAAI,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,YAAY,YAAY,mBAAmB,CAAC,CAAC;QAE/D,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAEnD,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpE,OAAO,SAAS,CAAC,YAA+B,CAAC,CAC/C,OAAO,EACP,gBAAgB,CAAC,MAAM,EACvB,IAAI,CACL,CAAC;IACJ,CAAC,EACD,EAAE,CACM,CAAC;AACb,CAAC,CAAC;AAEF;;;GAGG;AACH,SAAS,sBAAsB,CAAC,SAAmB;IACjD,0BAA0B;IAC1B,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO;YACL,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,mBAGb;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,mCAAmC;QACnC,OAAO;YACL,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5B,+DAA+D;YAC/D,YAAY,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;SAC9C,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAc;IAEd,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,QAAQ,IAAI,KAAK,CAAC;AAC1E,CAAC;AAED,SAAS,SAAS,CAAC,GAA4B,EAAE,IAAc;IAC7D,OAAO,IAAI,CAAC,MAAM,CAAU,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvC,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,IAAI,GAAG;YAC9C,OAAO,GAAG,CAAC,GAAuB,CAAC,CAAC;IACxC,CAAC,EAAE,GAAG,CAAC,CAAC;AACV,CAAC"}

package/dist/service-operation/ServiceOperationKey.d.ts

@@ -12,5 +12,5 @@ export type ServiceOperationInfiniteQueryKey<S extends {
     url: string;
     method: string;
 }, T> = ServiceOperationBaseQueryKey<S, true, T>;
-export type ServiceOperationMutationKey<S extends Record<'url' | 'method', string>, T extends unknown> = NonNullable<T> extends never ? [S] : [S, T];
+export type ServiceOperationMutationKey<S extends Record<'url' | 'method', string>, T> = NonNullable<T> extends never ? [S] : [S, T];
 //# sourceMappingURL=ServiceOperationKey.d.ts.map

package/dist/service-operation/ServiceOperationKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceOperationKey.d.ts","sourceRoot":"","sources":["../../src/service-operation/ServiceOperationKey.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,4BAA4B,CACtC,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACzC,QAAQ,SAAS,OAAO,EACxB,CAAC,IACC,CAAC,CAAC,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,EAAE,CAAC,CAAC,CAAC;AAEpC,MAAM,MAAM,wBAAwB,CAClC,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACzC,CAAC,IACC,4BAA4B,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAE9C,MAAM,MAAM,gCAAgC,CAC1C,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACzC,CAAC,IACC,4BAA4B,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,2BAA2B,CACrC,CAAC,SAAS,MAAM,CAAC,KAAK,GAAG,QAAQ,EAAE,MAAM,CAAC,EAC1C,CAAC,SAAS,OAAO,IACf,WAAW,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ServiceOperationKey.d.ts","sourceRoot":"","sources":["../../src/service-operation/ServiceOperationKey.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,4BAA4B,CACtC,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACzC,QAAQ,SAAS,OAAO,EACxB,CAAC,IACC,CAAC,CAAC,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,EAAE,CAAC,CAAC,CAAC;AAEpC,MAAM,MAAM,wBAAwB,CAClC,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACzC,CAAC,IACC,4BAA4B,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAE9C,MAAM,MAAM,gCAAgC,CAC1C,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACzC,CAAC,IACC,4BAA4B,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,2BAA2B,CACrC,CAAC,SAAS,MAAM,CAAC,KAAK,GAAG,QAAQ,EAAE,MAAM,CAAC,EAC1C,CAAC,IACC,WAAW,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}

package/dist/service-operation/ServiceOperationMutationFn.d.ts

@@ -1,7 +1,26 @@
+interface QueryFnBaseUrlOptions {
+    /**
+     * Base URL to use for the request
+     * @example 'https://api.example.com'
+     */
+    baseUrl: string;
+}
+interface ServiceOperationMutationFnOptionsBase<TBody, TParams> {
+    parameters: TParams;
+    body: TBody;
+}
+interface ServiceOperationMutationFnOptions<TBody, TParams> extends ServiceOperationMutationFnOptionsBase<TBody, TParams> {
+    baseUrl?: never;
+}
+interface ServiceOperationMutationFnOptionsWithBaseUrl<TBody, TParams> extends ServiceOperationMutationFnOptionsBase<TBody, TParams>, QueryFnBaseUrlOptions {
+}
 export interface ServiceOperationMutationFn<TSchema extends {
     url: string;
     method: string;
 }, TBody, TData, TParams> {
+    /**
+     * @deprecated Use `<service>.<operation>(...)` instead.
+     */
     mutationFn(client: (schema: TSchema, options: {
         parameters: TParams;
         body: TBody;
@@ -9,6 +28,9 @@ export interface ServiceOperationMutationFn<TSchema extends {
         parameters: TParams;
         body: TBody;
     }): TData;
+    /**
+     * @deprecated Use `<service>.<operation>(...)` instead.
+     */
     mutationFn(client: (schema: TSchema, options: {
         parameters: TParams;
         body: TBody;
@@ -16,5 +38,10 @@ export interface ServiceOperationMutationFn<TSchema extends {
         parameters: TParams;
         body: TBody;
     }): Promise<TData>;
+    <TOptions extends ServiceOperationMutationFnOptions<TBody, TParams>>(options: TOptions, client: (schema: TSchema, options: TOptions) => TData): TData;
+    <TOptions extends ServiceOperationMutationFnOptionsWithBaseUrl<TBody, TParams>>(options: TOptions, client: (schema: TSchema, options: TOptions) => TData): TData;
+    <TOptions extends ServiceOperationMutationFnOptions<TBody, TParams>>(options: TOptions, client: (schema: TSchema, options: TOptions) => Promise<TData>): Promise<TData>;
+    <TOptions extends ServiceOperationMutationFnOptionsWithBaseUrl<TBody, TParams>>(options: TOptions, client: (schema: TSchema, options: TOptions) => Promise<TData>): Promise<TData>;
 }
+export {};
 //# sourceMappingURL=ServiceOperationMutationFn.d.ts.map

package/dist/service-operation/ServiceOperationMutationFn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceOperationMutationFn.d.ts","sourceRoot":"","sources":["../../src/service-operation/ServiceOperationMutationFn.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,0BAA0B,CACzC,OAAO,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC/C,KAAK,EACL,KAAK,EACL,OAAO;IAEP,UAAU,CACR,MAAM,EAAE,CACN,MAAM,EAAE,OAAO,EACf,OAAO,EAAE;QACP,UAAU,EAAE,OAAO,CAAC;QACpB,IAAI,EAAE,KAAK,CAAC;KACb,KACE,KAAK,EACV,OAAO,EAAE;QACP,UAAU,EAAE,OAAO,CAAC;QACpB,IAAI,EAAE,KAAK,CAAC;KACb,GACA,KAAK,CAAC;IAET,UAAU,CACR,MAAM,EAAE,CACN,MAAM,EAAE,OAAO,EACf,OAAO,EAAE;QACP,UAAU,EAAE,OAAO,CAAC;QACpB,IAAI,EAAE,KAAK,CAAC;KACb,KACE,OAAO,CAAC,KAAK,CAAC,EACnB,OAAO,EAAE;QACP,UAAU,EAAE,OAAO,CAAC;QACpB,IAAI,EAAE,KAAK,CAAC;KACb,GACA,OAAO,CAAC,KAAK,CAAC,CAAC;CACnB"}
+{"version":3,"file":"ServiceOperationMutationFn.d.ts","sourceRoot":"","sources":["../../src/service-operation/ServiceOperationMutationFn.ts"],"names":[],"mappings":"AAAA,UAAU,qBAAqB;IAC7B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,qCAAqC,CAAC,KAAK,EAAE,OAAO;IAC5D,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC;CACb;AAED,UAAU,iCAAiC,CAAC,KAAK,EAAE,OAAO,CACxD,SAAQ,qCAAqC,CAAC,KAAK,EAAE,OAAO,CAAC;IAC7D,OAAO,CAAC,EAAE,KAAK,CAAC;CACjB;AAED,UAAU,4CAA4C,CAAC,KAAK,EAAE,OAAO,CACnE,SAAQ,qCAAqC,CAAC,KAAK,EAAE,OAAO,CAAC,EAC3D,qBAAqB;CAAG;AAE5B,MAAM,WAAW,0BAA0B,CACzC,OAAO,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC/C,KAAK,EACL,KAAK,EACL,OAAO;IAEP;;OAEG;IACH,UAAU,CACR,MAAM,EAAE,CACN,MAAM,EAAE,OAAO,EACf,OAAO,EAAE;QACP,UAAU,EAAE,OAAO,CAAC;QACpB,IAAI,EAAE,KAAK,CAAC;KACb,KACE,KAAK,EACV,OAAO,EAAE;QACP,UAAU,EAAE,OAAO,CAAC;QACpB,IAAI,EAAE,KAAK,CAAC;KACb,GACA,KAAK,CAAC;IAET;;OAEG;IACH,UAAU,CACR,MAAM,EAAE,CACN,MAAM,EAAE,OAAO,EACf,OAAO,EAAE;QACP,UAAU,EAAE,OAAO,CAAC;QACpB,IAAI,EAAE,KAAK,CAAC;KACb,KACE,OAAO,CAAC,KAAK,CAAC,EACnB,OAAO,EAAE;QACP,UAAU,EAAE,OAAO,CAAC;QACpB,IAAI,EAAE,KAAK,CAAC;KACb,GACA,OAAO,CAAC,KAAK,CAAC,CAAC;IAElB,CAAC,QAAQ,SAAS,iCAAiC,CAAC,KAAK,EAAE,OAAO,CAAC,EACjE,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,KAAK,KAAK,GACpD,KAAK,CAAC;IAET,CACE,QAAQ,SAAS,4CAA4C,CAC3D,KAAK,EACL,OAAO,CACR,EAED,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,KAAK,KAAK,GACpD,KAAK,CAAC;IAET,CAAC,QAAQ,SAAS,iCAAiC,CAAC,KAAK,EAAE,OAAO,CAAC,EACjE,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,KAAK,CAAC,GAC7D,OAAO,CAAC,KAAK,CAAC,CAAC;IAElB,CACE,QAAQ,SAAS,4CAA4C,CAC3D,KAAK,EACL,OAAO,CACR,EAED,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,KAAK,CAAC,GAC7D,OAAO,CAAC,KAAK,CAAC,CAAC;CACnB"}

package/dist/service-operation/ServiceOperationQueryFn.d.ts

@@ -6,27 +6,74 @@ interface QueryFnOptionsBase<TMeta extends Record<string, any>, TSignal extends
 interface QueryFnOptionsByParameters<TParams, TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal> extends QueryFnOptionsBase<TMeta, TSignal> {
     parameters: TParams;
     queryKey?: never;
+    baseUrl?: never;
+}
+interface QueryFnOptionsByParametersWithBaseUrl<TParams, TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal> extends QueryFnOptionsBase<TMeta, TSignal>, QueryFnBaseUrlOptions {
+    parameters: TParams;
+    queryKey?: never;
 }
 interface QueryFnOptionsByQueryKey<TSchema extends {
     url: string;
     method: string;
 }, TParams, TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal> extends QueryFnOptionsBase<TMeta, TSignal> {
     queryKey: ServiceOperationQueryKey<TSchema, TParams>;
+    parameters?: never;
+    baseUrl?: never;
+}
+interface QueryFnOptionsByQueryKeyWithBaseUrl<TSchema extends {
+    url: string;
+    method: string;
+}, TParams, TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal> extends QueryFnOptionsBase<TMeta, TSignal>, QueryFnBaseUrlOptions {
+    queryKey: ServiceOperationQueryKey<TSchema, TParams>;
+    parameters?: never;
+}
+interface QueryFnBaseUrlOptions {
+    /**
+     * Base URL to use for the request
+     * @example 'https://api.example.com'
+     */
+    baseUrl: string;
 }
 export interface ServiceOperationQueryFn<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams> {
+    /**
+     * @deprecated Use `<service>.<operation>(...)` instead.
+     */
     queryFn<TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal>(options: QueryFnOptionsByParameters<TParams, TMeta, TSignal> | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>, client: (schema: TSchema, options: {
         parameters: TParams;
         signal?: TSignal;
         meta?: TMeta;
     }) => TData): TData;
+    /**
+     * @deprecated Use `<service>.<operation>(...)` instead.
+     */
     queryFn<TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal>(options: QueryFnOptionsByParameters<TParams, TMeta, TSignal> | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>, client: (schema: TSchema, options: {
         parameters: TParams;
         signal?: TSignal;
         meta?: TMeta;
     }) => Promise<TData>): Promise<TData>;
+    <TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal>(options: QueryFnOptionsByParameters<TParams, TMeta, TSignal> | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>, client: (schema: TSchema, options: {
+        parameters: TParams;
+        signal?: TSignal;
+        meta?: TMeta;
+    }) => TData): TData;
+    <TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal>(options: QueryFnOptionsByParametersWithBaseUrl<TParams, TMeta, TSignal> | QueryFnOptionsByQueryKeyWithBaseUrl<TSchema, TParams, TMeta, TSignal>, client: (schema: TSchema, options: {
+        parameters: TParams;
+        signal?: TSignal;
+        meta?: TMeta;
+    } & QueryFnBaseUrlOptions) => TData): TData;
+    <TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal>(options: QueryFnOptionsByParameters<TParams, TMeta, TSignal> | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>, client: (schema: TSchema, options: {
+        parameters: TParams;
+        signal?: TSignal;
+        meta?: TMeta;
+    }) => Promise<TData>): Promise<TData>;
+    <TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal>(options: QueryFnOptionsByParametersWithBaseUrl<TParams, TMeta, TSignal> | QueryFnOptionsByQueryKeyWithBaseUrl<TSchema, TParams, TMeta, TSignal>, client: (schema: TSchema, options: {
+        parameters: TParams;
+        signal?: TSignal;
+        meta?: TMeta;
+    } & QueryFnBaseUrlOptions) => Promise<TData>): Promise<TData>;
 }
 export {};
 //# sourceMappingURL=ServiceOperationQueryFn.d.ts.map

package/dist/service-operation/ServiceOperationQueryFn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceOperationQueryFn.d.ts","sourceRoot":"","sources":["../../src/service-operation/ServiceOperationQueryFn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEzE,UAAU,kBAAkB,CAC1B,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,OAAO,SAAS,WAAW,GAAG,WAAW;IAEzC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,KAAK,CAAC;CACd;AAED,UAAU,0BAA0B,CAClC,OAAO,EACP,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,OAAO,SAAS,WAAW,GAAG,WAAW,CACzC,SAAQ,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC;IAC1C,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,KAAK,CAAC;CAClB;AAED,UAAU,wBAAwB,CAChC,OAAO,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC/C,OAAO,EACP,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,OAAO,SAAS,WAAW,GAAG,WAAW,CACzC,SAAQ,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC;IAC1C,QAAQ,EAAE,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CACtD;AAED,MAAM,WAAW,uBAAuB,CACtC,OAAO,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC/C,KAAK,EACL,OAAO;IAEP,OAAO,CACL,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,OAAO,SAAS,WAAW,GAAG,WAAW,EAEzC,OAAO,EACH,0BAA0B,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,GACnD,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,EAC9D,MAAM,EAAE,CACN,MAAM,EAAE,OAAO,EACf,OAAO,EAAE;QACP,UAAU,EAAE,OAAO,CAAC;QACpB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,IAAI,CAAC,EAAE,KAAK,CAAC;KACd,KACE,KAAK,GACT,KAAK,CAAC;IAET,OAAO,CACL,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,OAAO,SAAS,WAAW,GAAG,WAAW,EAEzC,OAAO,EACH,0BAA0B,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,GACnD,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,EAC9D,MAAM,EAAE,CACN,MAAM,EAAE,OAAO,EACf,OAAO,EAAE;QACP,UAAU,EAAE,OAAO,CAAC;QACpB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,IAAI,CAAC,EAAE,KAAK,CAAC;KACd,KACE,OAAO,CAAC,KAAK,CAAC,GAClB,OAAO,CAAC,KAAK,CAAC,CAAC;CACnB"}
+{"version":3,"file":"ServiceOperationQueryFn.d.ts","sourceRoot":"","sources":["../../src/service-operation/ServiceOperationQueryFn.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/react",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "API client for React, providing type-safe requests and dynamic Tanstack Query React Hooks via a modular, Proxy-based architecture.",
   "scripts": {
     "build": "rimraf dist/ && tsc --project tsconfig.build.json",
@@ -8,14 +8,17 @@
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
     "typecheck": "tsc --noEmit",
-    "generate-qraft": "openapi-qraft src/tests/fixtures/openapi.json --clean -o src/tests/fixtures/api --openapi-types-import-path '../../openapi.js' --explicit-import-extensions --filter-services '/approval_policies/**,/entities/**,/files/**,!/internal/**' && prettier --write src/tests/fixtures/api/**/*.ts",
-    "generate-types": "openapi-qraft-typescript src/tests/fixtures/openapi.json -o src/tests/fixtures/openapi.ts"
+    "lint": "eslint",
+    "generate-qraft": "openapi-qraft --plugin tanstack-query-react ../test-fixtures/openapi.json --clean -o src/tests/fixtures/api --openapi-types-import-path '../../openapi.js' --explicit-import-extensions --filter-services '/approval_policies/**,/entities/**,/files/**,!/internal/**' && prettier --write src/tests/fixtures/api/**/*.ts",
+    "generate-types": "openapi-qraft-typescript ../test-fixtures/openapi.json -o src/tests/fixtures/openapi.ts"
   },
   "type": "module",
   "sideEffects": false,
   "devDependencies": {
-    "@openapi-qraft/cli": "~1.7.0",
+    "@openapi-qraft/cli": "~1.8.0",
+    "@openapi-qraft/eslint-config": "~1.0.0",
     "@openapi-qraft/openapi-typescript": "^1.0.0",
+    "@openapi-qraft/test-fixtures": "~1.0.0",
     "@tanstack/react-query": "^5.17.3",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
@@ -23,6 +26,8 @@
     "@types/react": "^18.2.47",
     "@vitejs/plugin-react": "latest",
     "@vitest/coverage-v8": "^1.1.3",
+    "eslint": "^9.0.0",
+    "globals": "^15.0.0",
     "jsdom": "latest",
     "msw": "^2.0.12",
     "prettier": "^3.1.1",

package/src/QraftContext.ts

@@ -8,7 +8,7 @@ import type { OperationSchema, RequestFnPayload } from './lib/requestFn.js';
 
 interface QraftContextValueBase {
   /**
-   * The base URL to use for all requests.
+   * Base URL to use for the request
    * @example 'https://api.example.com'
    */
   baseUrl?: string;

package/src/ServiceOperation.ts

@@ -63,5 +63,5 @@ export type ServiceOperationInfiniteQueryKey<
  */
 export type ServiceOperationMutationKey<
   S extends Record<'url' | 'method', string>,
-  T extends unknown,
+  T,
 > = ServiceOperationMutationKeyBase<S, T>;

package/src/callbacks/mutationFn.ts

@@ -16,7 +16,7 @@ export const mutationFn = (
     >['mutationFn']
   >;
   return client(schema, {
-    parameters: options.parameters,
-    body: options.body,
+    parameters: options?.parameters,
+    body: options?.body,
   });
 };

package/src/callbacks/operationInvokeFn.ts

@@ -0,0 +1,45 @@
+import type { OperationSchema } from '../lib/requestFn.js';
+import type { QraftClientOptions } from '../qraftAPIClient.js';
+import { ServiceOperationMutationFn } from '../service-operation/ServiceOperationMutationFn.js';
+import { ServiceOperationQueryFn } from '../service-operation/ServiceOperationQueryFn.js';
+
+/**
+ * Called when <service>.<operation>(...) is invoked.
+ */
+export const operationInvokeFn: <
+  TSchema extends OperationSchema,
+  TBody,
+  TData,
+  TParams,
+>(
+  qraftOptions: QraftClientOptions | undefined,
+  schema: TSchema,
+  args:
+    | Parameters<ServiceOperationQueryFn<TSchema, TData, TParams>>
+    | Parameters<ServiceOperationMutationFn<TSchema, TBody, TData, TParams>>
+) => Promise<TData> = (_, schema, args) => {
+  const queryOperationMethods = ['get', 'head', 'options'] as const; // todo::make it shared
+
+  const isQueryOperationType = queryOperationMethods.includes(
+    schema.method as (typeof queryOperationMethods)[number]
+  );
+
+  const [options, client] = args;
+
+  const invokeSchema =
+    isQueryOperationType && 'queryKey' in options
+      ? options.queryKey![0]
+      : schema;
+
+  const invokeParameters =
+    isQueryOperationType && 'queryKey' in options
+      ? options.queryKey![1]
+      : 'parameters' in options
+        ? options.parameters
+        : undefined;
+
+  return client(invokeSchema, {
+    ...options,
+    parameters: invokeParameters,
+  } as never);
+};

package/src/callbacks/queryFn.ts

@@ -12,10 +12,15 @@ export const queryFn: <
 ) => Promise<TData> = (_, schema, args) => {
   const [options, client] = args;
 
-  return client('queryKey' in options ? options.queryKey![0] : schema, {
-    parameters:
-      'queryKey' in options ? options.queryKey![1] : options.parameters,
-    meta: options.meta,
-    signal: options.signal,
-  }) as Promise<never>;
+  return client(
+    options && 'queryKey' in options ? options.queryKey![0] : schema,
+    {
+      parameters:
+        options && 'queryKey' in options
+          ? options.queryKey![1]
+          : options.parameters,
+      meta: options.meta,
+      signal: options.signal,
+    }
+  ) as Promise<never>;
 };

package/src/callbacks/useInfiniteQuery.ts

@@ -23,7 +23,7 @@ export const useInfiniteQuery: <
   >
 ) => UseInfiniteQueryResult<TData, TError> = (qraftOptions, schema, args) => {
   return useInfiniteQueryBase(
-    // @ts-expect-error
+    // @ts-expect-error - Too complex to type...
     ...useComposeUseQueryOptions(qraftOptions, schema, args, true)
   ) as never;
 };

package/src/callbacks/useQueries.ts

@@ -40,7 +40,7 @@ export const useQueries: (
                   },
                   queryOptions
                 );
-                // @ts-expect-error
+                // @ts-expect-error - `parameters` is not inferred as a property of `queryOptionsCopy`
                 delete queryOptionsCopy.parameters;
                 return queryOptionsCopy;
               })()

package/src/callbacks/useQuery.ts

@@ -19,7 +19,7 @@ export const useQuery: <TData = unknown, TError = DefaultError>(
   >
 ) => UseQueryResult<TData, TError> = (qraftOptions, schema, args) => {
   return useQueryTanstack(
-    // @ts-expect-error
+    // @ts-expect-error - Too complex to type
     ...useComposeUseQueryOptions(qraftOptions, schema, args, false)
   ) as never;
 };

package/src/callbacks/useSuspenseInfiniteQuery.ts

@@ -31,7 +31,7 @@ export const useSuspenseInfiniteQuery: <
   args
 ) => {
   return useSuspenseInfiniteQueryTanstack(
-    // @ts-expect-error
+    // @ts-expect-error - Too complex to type
     ...useComposeUseQueryOptions(qraftOptions, schema, args, true)
   ) as never;
 };

package/src/callbacks/useSuspenseQueries.ts

@@ -44,7 +44,7 @@ export const useSuspenseQueries: (
                   },
                   queryOptions
                 );
-                // @ts-expect-error
+                // @ts-expect-error - `parameters` is not inferred as a property of `queryOptionsCopy`
                 delete queryOptionsCopy.parameters;
                 return queryOptionsCopy;
               })()

package/src/callbacks/useSuspenseQuery.ts

@@ -23,7 +23,7 @@ export const useSuspenseQuery: <
   >
 ) => UseQueryResult<TData, TError> = (qraftOptions, schema, args) => {
   return useSuspenseQueryTanstack(
-    // @ts-expect-error
+    // @ts-expect-error - Too complex to type
     ...useComposeUseQueryOptions(qraftOptions, schema, args, false)
   ) as never;
 };

package/src/lib/callQueryClientFetchMethod.ts

@@ -40,7 +40,7 @@ export function callQueryClientMethodWithQueryKey<
   const queryFn =
     options.queryFn ??
     (requestFn
-      ? // @ts-expect-error
+      ? // @ts-expect-error - Not inferring the correct type for `queryFn`
         function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
           return requestFn(schema, {
             parameters: infinite
@@ -54,7 +54,7 @@ export function callQueryClientMethodWithQueryKey<
       : undefined);
 
   if (parameters) {
-    // @ts-expect-error
+    // @ts-expect-error - Too complex union to type
     return queryClient[queryFilterMethod]({
       ...options,
       // Event if queryFn is undefined, it will override the default queryFn from `setQueryDefaults(...)`
@@ -65,7 +65,7 @@ export function callQueryClientMethodWithQueryKey<
     });
   }
 
-  // @ts-expect-error
+  // @ts-expect-error - Too complex union to type
   return queryClient[queryFilterMethod]({ ...options, queryFn });
 }
 

package/src/lib/callQueryClientMethodWithMutationFilters.ts

@@ -23,10 +23,10 @@ export function callQueryClientMethodWithMutationFilters<
       `queryClient is invalid, ${queryFilterMethod} method does not exist`
     );
 
-  // @ts-expect-error
+  // @ts-expect-error - Too complex to type
   return queryClient[queryFilterMethod](
     composeMutationFilters(schema, filters as never),
-    // @ts-expect-error
+    // @ts-expect-error - Argument types are too complex
     ...args.slice(1, -1)
   );
 }

package/src/lib/callQueryClientMethodWithQueryFilters.ts

@@ -23,10 +23,10 @@ export function callQueryClientMethodWithQueryFilters<
       `queryClient is invalid, ${queryFilterMethod} method does not exist`
     );
 
-  // @ts-expect-error
+  // @ts-expect-error - Too complex to type
   return queryClient[queryFilterMethod](
     composeQueryFilters(schema, filters as never),
-    // @ts-expect-error
+    // @ts-expect-error - Argument types are too complex
     ...args.slice(1, -1)
   );
 }

package/src/lib/callQueryClientMethodWithQueryKey.ts

@@ -31,7 +31,7 @@ export function callQueryClientMethodWithQueryKey<
       ? composeInfiniteQueryKey(schema, parameters)
       : composeQueryKey(schema, parameters);
 
-  // @ts-expect-error
+  // @ts-expect-error - Too complex to type
   return queryClient[queryFilterMethod](queryKey, ...args.slice(1, -1));
 }
 

package/src/lib/composeMutationKey.ts

@@ -5,10 +5,7 @@ import type { OperationSchema } from './requestFn.js';
  * Omit `body` or `requestBody` from mutation parameters if exists
  * and return the rest of the parameters
  */
-export function composeMutationKey<
-  TSchema extends OperationSchema,
-  TParams = undefined,
->(
+export function composeMutationKey<TSchema extends OperationSchema>(
   schema: TSchema,
   parameters: undefined
 ): ServiceOperationMutationKey<TSchema, undefined>;
@@ -36,10 +33,11 @@ export function omitMutationPayload<T>(params: T) {
     throw new Error('`params` must be object');
 
   if ('body' in params || 'requestBody' in params) {
-    const { body, requestBody, ...paramsRest } = params as Record<
-      'body' | 'requestBody',
-      unknown
-    >;
+    const {
+      body: _,
+      requestBody: __,
+      ...paramsRest
+    } = params as Record<'body' | 'requestBody', unknown>;
     return paramsRest;
   }
 

package/src/lib/createRecursiveProxy.ts

@@ -5,6 +5,13 @@ type ProxyApplyCallback = (path: string[], args: unknown[]) => unknown;
  */
 type ProxyGetCallback = (path: string[], key: string) => unknown | undefined;
 
+// todo::rename to `qraftRecursiveProxy` with deprecated `createRecursiveProxy`
+/**
+ * Creates a recursive proxy that calls the `getCallback` and `applyCallback` functions
+ * @param getCallback The callback to call when a proxy property is accessed
+ * @param applyCallback The callback to call when a proxy is called as a function
+ * @param path The current path of the proxy
+ */
 export function createRecursiveProxy(
   getCallback: ProxyGetCallback,
   applyCallback: ProxyApplyCallback,