@openapi-qraft/react 1.0.3 → 1.0.6

package/dist/qraftAPIClient.d.ts

@@ -4,12 +4,23 @@ import type { RequestClientSchema } from './RequestClient.js';
 export type QraftClientOptions = {
     context?: Context<QraftContextValue>;
 };
-export declare const qraftAPIClient: <Services extends { [service in keyof Services]: { [method in keyof Services[service]]: {
-    schema: RequestClientSchema;
-}; }; }, Callbacks extends Record<string, (...rest: any[]) => any>>(services: { [service_1 in keyof Services]: { [method_1 in keyof Services[service_1]]: {
-    schema: Services[service_1][method_1]["schema"];
-}; }; }, callbacks: Callbacks, options?: QraftClientOptions) => ServicesCallbacksFilter<Services, keyof Callbacks>;
-type ServicesCallbacksFilter<Services, Callbacks> = Services extends {
+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> = {
+    [service in keyof Services]: {
+        [method in keyof Services[service]]: {
+            schema: RequestClientSchema;
+        };
+    };
+};
+type ServicesDeclaration<Services extends ServicesOutput<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: RequestClientSchema;
@@ -17,7 +28,7 @@ type ServicesCallbacksFilter<Services, Callbacks> = Services extends {
     };
 } ? {
     [serviceName in keyof Services]: {
-        [method in keyof Services[serviceName]]: Pick<Services[serviceName][method], FilterKeys<keyof Services[serviceName][method], Callbacks | 'schema'>>;
+        [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;

package/dist/qraftAPIClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qraftAPIClient.d.ts","sourceRoot":"","sources":["../src/qraftAPIClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,cAAc;YAG0B,mBAAmB;oDAG3B,GAAG,EAAE,KAAK,GAAG;;yCAU9C,kBAAkB,uDAoB7B,CAAC;AAeF,KAAK,uBAAuB,CAAC,QAAQ,EAAE,SAAS,IAAI,QAAQ,SAAS;KAClE,WAAW,IAAI,MAAM,QAAQ,GAAG;SAC9B,MAAM,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG;YAAE,MAAM,EAAE,mBAAmB,CAAA;SAAE;KACzE;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,CAAC,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC,CACtE;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,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,cAAc,4JAMf,kBAAkB,uDAoB7B,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,mBAAmB,CAAA;SAAE;KACrE;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,mBAAmB,CAAA;SAAE;KACzE;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"}

package/dist/qraftAPIClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"qraftAPIClient.js","sourceRoot":"","sources":["../src/qraftAPIClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAQvF,MAAM,CAAC,MAAM,cAAc,GAAG,CAQ5B,QAMC,EACD,SAAoB,EACpB,OAA4B,EACwB,EAAE;IACtD,OAAO,6BAA6B,CAClC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EACtB,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE;QAC3B,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpE,IAAI,YAAY,IAAI,SAAS,EAAE,CAAC;YAC9B,OAAO,SAAS,CAAC,YAA+B,CAAC,CAC/C,OAAO,EACP,gBAAgB,CAAC,MAAM,EACvB,IAAI,CACL,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC,CACO,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":"AAEA,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAQvF,MAAM,CAAC,MAAM,cAAc,GAAG,CAI5B,QAAuC,EACvC,SAAoB,EACpB,OAA4B,EACwB,EAAE;IACtD,OAAO,6BAA6B,CAClC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EACtB,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE;QAC3B,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpE,IAAI,YAAY,IAAI,SAAS,EAAE,CAAC;YAC9B,OAAO,SAAS,CAAC,YAA+B,CAAC,CAC/C,OAAO,EACP,gBAAgB,CAAC,MAAM,EACvB,IAAI,CACL,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC,CACO,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"}

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@openapi-qraft/react",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "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",
-    "dev": "rimraf dist/ && tsc --project tsconfig.dev.json --watch",
+    "dev": "rimraf dist/ && tsc --project tsconfig.build.json --watch",
     "test": "vitest run",
     "typecheck": "tsc --noEmit",
-    "generate-qraft": "openapi-qraft ./src/fixtures/openapi.json --clean -o src/fixtures/api --openapi-types-import-path '../../openapi.js' --explicit-import-extensions",
-    "generate-types": "openapi-qraft-typescript ./src/fixtures/openapi.json -o src/fixtures/openapi.ts"
+    "generate-qraft": "openapi-qraft src/tests/fixtures/openapi.json --clean -o src/tests/fixtures/api --openapi-types-import-path '../../openapi.js' --explicit-import-extensions",
+    "generate-types": "openapi-qraft-typescript src/tests/fixtures/openapi.json -o src/tests/fixtures/openapi.ts"
   },
   "type": "module",
   "sideEffects": false,
   "devDependencies": {
-    "@openapi-qraft/cli": "~1.0.2",
+    "@openapi-qraft/cli": "~1.0.3",
     "@openapi-qraft/openapi-typescript": "^1.0.0",
     "@tanstack/react-query": "^5.17.3",
     "@testing-library/jest-dom": "^5.17.0",
@@ -37,8 +37,8 @@
   "files": [
     "dist",
     "src",
-    "!dist/fixtures/**",
-    "!src/fixtures/**"
+    "!dist/tests/**",
+    "!src/tests/**"
   ],
   "exports": {
     "./package.json": "./package.json",

package/src/ServiceOperation.ts

@@ -29,22 +29,20 @@ import {
   UseSuspenseQueryResult,
 } from '@tanstack/react-query';
 
-export type ServiceOperationQueryKey<S extends { url: string }, T> = [
-  Pick<S, 'url'>,
+export type ServiceOperationQueryKey<
+  S extends { url: string; method: string },
   T,
-];
+> = [S, T];
 
-export type ServiceOperationInfiniteQueryKey<S extends { url: string }, T> = [
-  Pick<S, 'url'> & { infinite: true },
+export type ServiceOperationInfiniteQueryKey<
+  S extends { url: string; method: string },
   T,
-];
+> = [S & { infinite: true }, T];
 
 export type ServiceOperationMutationKey<
   S extends Record<'url' | 'method', string>,
   T extends unknown,
-> = NonNullable<T> extends never
-  ? [Pick<S, 'url' | 'method'>]
-  : [Pick<S, 'url' | 'method'>, T];
+> = NonNullable<T> extends never ? [S] : [S, T];
 
 export interface ServiceOperationQuery<
   TSchema extends { url: string; method: string },
@@ -62,6 +60,11 @@ export interface ServiceOperationQuery<
     ServiceOperationSetQueryData<TData, TParams>,
     ServiceOperationSetInfiniteQueryData<TData, TParams> {
   schema: TSchema;
+  types: {
+    parameters: TParams;
+    data: TData;
+    error: TError;
+  };
 }
 
 interface ServiceOperationUseQuery<
@@ -253,6 +256,12 @@ export interface ServiceOperationMutation<
     ServiceOperationMutationFn<TSchema, TBody, TData, TParams>,
     ServiceOperationSetQueryData<TData, TParams> {
   schema: TSchema;
+  types: {
+    parameters: TParams;
+    data: TData;
+    error: TError;
+    body: TBody;
+  };
 }
 
 interface ServiceOperationUseMutation<
@@ -275,10 +284,7 @@ interface ServiceOperationUseMutation<
       UseMutationOptions<TData, TError, TVariables, TContext>,
       'mutationKey'
     > & {
-      mutationKey?: ServiceOperationMutationKey<
-        TSchema,
-        NonNullable<TParams> extends never ? {} : TParams
-      >;
+      mutationKey?: ServiceOperationMutationKey<TSchema, TParams>;
     },
     queryClient?: QueryClient
   ): UseMutationResult<TData, TError | Error, TVariables, TContext>;
@@ -293,14 +299,13 @@ interface ServiceOperationUseMutation<
   ): UseMutationResult<TData, TError | Error, TVariables, TContext>;
 }
 
-type MutationFilters<
-  TSchema extends { url: string; method: string },
+interface UseMutationStateFiltersBase<
   TBody,
   TData,
   TParams,
   TError = DefaultError,
   TContext = unknown,
-> = {
+> {
   /**
    * Match mutation key exactly
    */
@@ -321,23 +326,34 @@ type MutationFilters<
    * Filter by mutation status
    */
   status?: MutationStatus;
-} & (
-  | {
-      /**
-       * Include mutations matching this mutation key
-       */
-      mutationKey?: ServiceOperationMutationKey<
-        TSchema,
-        PartialParams<TParams>
-      >;
-    }
-  | {
-      /**
-       * Include mutations matching these parameters
-       */
-      parameters?: PartialParams<TParams>;
-    }
-);
+}
+
+interface UseMutationStateFiltersByParameters<
+  TBody,
+  TData,
+  TParams,
+  TError = DefaultError,
+  TContext = unknown,
+> extends UseMutationStateFiltersBase<TBody, TData, TParams, TError, TContext> {
+  /**
+   * Include mutations matching these parameters
+   */
+  parameters?: PartialParams<TParams>;
+}
+
+interface UseMutationStateFiltersByMutationKey<
+  TSchema extends { url: string; method: string },
+  TBody,
+  TData,
+  TParams,
+  TError = DefaultError,
+  TContext = unknown,
+> extends UseMutationStateFiltersBase<TBody, TData, TParams, TError, TContext> {
+  /**
+   * Include mutations matching this mutation key
+   */
+  mutationKey?: ServiceOperationMutationKey<TSchema, PartialParams<TParams>>;
+}
 
 type MutationVariables<TBody, TParams> = {
   body: TBody;
@@ -360,14 +376,22 @@ interface ServiceOperationUseMutationState<
     >,
   >(
     options?: {
-      filters?: MutationFilters<
-        TSchema,
-        TBody,
-        TData,
-        TParams,
-        TError,
-        TContext
-      >;
+      filters?:
+        | UseMutationStateFiltersByParameters<
+            TBody,
+            TData,
+            TParams,
+            TError,
+            TContext
+          >
+        | UseMutationStateFiltersByMutationKey<
+            TSchema,
+            TBody,
+            TData,
+            TParams,
+            TError,
+            TContext
+          >;
       select?: (
         mutation: Mutation<
           TData,
@@ -381,6 +405,31 @@ interface ServiceOperationUseMutationState<
   ): Array<TResult>;
 }
 
+interface QueryFnOptionsBase<
+  TMeta extends Record<string, any>,
+  TSignal extends AbortSignal = AbortSignal,
+> {
+  signal?: TSignal;
+  meta?: TMeta;
+}
+
+interface QueryFnOptionsByParameters<
+  TParams,
+  TMeta extends Record<string, any>,
+  TSignal extends AbortSignal = AbortSignal,
+> extends QueryFnOptionsBase<TMeta, TSignal> {
+  parameters: TParams;
+}
+
+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>;
+}
+
 interface ServiceOperationQueryFn<
   TSchema extends { url: string; method: string },
   TData,
@@ -390,10 +439,9 @@ interface ServiceOperationQueryFn<
     TMeta extends Record<string, any>,
     TSignal extends AbortSignal = AbortSignal,
   >(
-    options: { signal?: TSignal; meta?: TMeta } & (
-      | { queryKey: [unknown, TParams] }
-      | { parameters: TParams }
-    ),
+    options:
+      | QueryFnOptionsByParameters<TParams, TMeta, TSignal>
+      | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>,
     client: (
       schema: TSchema,
       options: {
@@ -408,10 +456,9 @@ interface ServiceOperationQueryFn<
     TMeta extends Record<string, any>,
     TSignal extends AbortSignal = AbortSignal,
   >(
-    options: { signal?: TSignal; meta?: TMeta } & (
-      | { queryKey: [unknown, TParams] }
-      | { parameters: TParams }
-    ),
+    options:
+      | QueryFnOptionsByParameters<TParams, TMeta, TSignal>
+      | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>,
     client: (
       schema: TSchema,
       options: {

package/src/callbacks/getInfiniteQueryData.ts

@@ -18,9 +18,9 @@ export function getInfiniteQueryData<TData>(
     >['getInfiniteQueryData']
   >
 ): InfiniteData<TData> | undefined {
-  const [params, queryClient] = args;
+  const [parameters, queryClient] = args;
   return queryClient.getQueryData([
-    { url: schema.url, infinite: true },
-    params,
+    { url: schema.url, method: schema.method, infinite: true },
+    parameters,
   ] satisfies ServiceOperationInfiniteQueryKey<RequestClientSchema, unknown>);
 }

package/src/callbacks/getInfiniteQueryKey.ts

@@ -17,7 +17,7 @@ export const getInfiniteQueryKey = (
   >
 ) => {
   return [
-    { url: schema.url, infinite: true },
+    { url: schema.url, method: schema.method, infinite: true },
     args[0],
   ] satisfies ServiceOperationInfiniteQueryKey<RequestClientSchema, unknown>;
 };

package/src/callbacks/getQueryData.ts

@@ -12,9 +12,9 @@ export function getQueryData<TData>(
     ServiceOperationQuery<RequestClientSchema, unknown, TData>['getQueryData']
   >
 ): TData | undefined {
-  const [params, queryClient] = args;
+  const [parameters, queryClient] = args;
   return queryClient.getQueryData([
-    { url: schema.url },
-    params,
+    { url: schema.url, method: schema.method },
+    parameters,
   ] satisfies ServiceOperationQueryKey<RequestClientSchema, unknown>);
 }

package/src/callbacks/getQueryKey.ts

@@ -12,8 +12,8 @@ export const getQueryKey = (
     ServiceOperationQuery<RequestClientSchema, unknown, unknown>['getQueryKey']
   >
 ) => {
-  return [{ url: schema.url }, args[0]] satisfies ServiceOperationQueryKey<
-    RequestClientSchema,
-    unknown
-  >;
+  return [
+    { url: schema.url, method: schema.method },
+    args[0],
+  ] satisfies ServiceOperationQueryKey<RequestClientSchema, unknown>;
 };

package/src/callbacks/queryFn.ts

@@ -1,21 +1,21 @@
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationQuery } from '../ServiceOperation.js';
 
-export const queryFn = (
+export const queryFn: <
+  TSchema extends { url: string; method: 'get' | 'head' | 'options' },
+  TData,
+  TParams,
+>(
   qraftOptions: QraftClientOptions | undefined,
-  schema: RequestClientSchema,
-  args: Parameters<
-    ServiceOperationQuery<RequestClientSchema, unknown, never>['queryFn']
-  >
-) => {
+  schema: TSchema,
+  args: Parameters<ServiceOperationQuery<TSchema, TData, TParams>['queryFn']>
+) => Promise<TData> = (_, schema, args) => {
   const [options, client] = args;
-  const parameters =
-    'queryKey' in options ? options.queryKey[1] : options.parameters;
 
-  return client(schema, {
-    parameters,
+  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>;
 };

package/src/callbacks/setInfiniteQueryData.ts

@@ -18,12 +18,12 @@ export function setInfiniteQueryData<TData>(
     >['setInfiniteQueryData']
   >
 ): InfiniteData<TData> | undefined {
-  const [params, updater, queryClient, options] = args;
+  const [parameters, updater, queryClient, options] = args;
 
   const queryKey: ServiceOperationInfiniteQueryKey<
     RequestClientSchema,
     unknown
-  > = [{ url: schema.url, infinite: true }, params];
+  > = [{ url: schema.url, method: schema.method, infinite: true }, parameters];
 
   return queryClient.setQueryData(queryKey, updater as never, options);
 }

package/src/callbacks/setQueryData.ts

@@ -12,11 +12,11 @@ export function setQueryData<TData>(
     ServiceOperationQuery<RequestClientSchema, unknown, TData>['setQueryData']
   >
 ): TData | undefined {
-  const [params, updater, queryClient, options] = args;
+  const [parameters, updater, queryClient, options] = args;
 
   const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> = [
-    { url: schema.url },
-    params,
+    { url: schema.url, method: schema.method },
+    parameters,
   ];
 
   return queryClient.setQueryData(queryKey, updater as never, options);

package/src/callbacks/useInfiniteQuery.ts

@@ -29,7 +29,7 @@ export const useInfiniteQuery: <
     >['useInfiniteQuery']
   >
 ) => UseInfiniteQueryResult<TData, TError> = (qraftOptions, schema, args) => {
-  const [params, options, ...restArgs] = args;
+  const [parameters, options, ...restArgs] = args;
 
   const requestClient = useContext(qraftOptions?.context ?? QraftContext)
     ?.requestClient;
@@ -39,7 +39,10 @@ export const useInfiniteQuery: <
   return useInfiniteQueryBase(
     {
       ...options,
-      queryKey: [{ url: schema.url, infinite: true }, params as never] as const,
+      queryKey: [
+        { url: schema.url, method: schema.method, infinite: true },
+        parameters as never,
+      ] as const,
       queryFn:
         options?.queryFn ??
         function ({ queryKey: [, queryParams], signal, meta, pageParam }) {

package/src/callbacks/useQueries.ts

@@ -35,7 +35,7 @@ export const useQueries: (
       queries: options.queries.map(({ parameters, ...queryOptions }) => ({
         ...queryOptions,
         queryKey: [
-          { url: schema.url },
+          { url: schema.url, method: schema.method },
           parameters,
         ] satisfies ServiceOperationQueryKey<RequestClientSchema, unknown>,
         queryFn:

package/src/callbacks/useQuery.ts

@@ -25,7 +25,7 @@ export const useQuery: <
     ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useQuery']
   >
 ) => UseQueryResult<TData, TError> = (qraftOptions, schema, args) => {
-  const [params, options, ...restArgs] = args;
+  const [parameters, options, ...restArgs] = args;
 
   const requestClient = useContext(qraftOptions?.context ?? QraftContext)
     ?.requestClient;
@@ -33,8 +33,8 @@ export const useQuery: <
   if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
 
   const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> = [
-    { url: schema.url },
-    params,
+    { url: schema.url, method: schema.method },
+    parameters,
   ];
 
   return useQueryBase(

package/src/callbacks/useSuspenseInfiniteQuery.ts

@@ -36,7 +36,7 @@ export const useSuspenseInfiniteQuery: <
   schema,
   args
 ) => {
-  const [params, options, ...restArgs] = args;
+  const [parameters, options, ...restArgs] = args;
 
   const requestClient = useContext(qraftOptions?.context ?? QraftContext)
     ?.requestClient;
@@ -46,7 +46,10 @@ export const useSuspenseInfiniteQuery: <
   return useSuspenseInfiniteQueryTanstack(
     {
       ...options,
-      queryKey: [{ url: schema.url, infinite: true }, params as never] as const,
+      queryKey: [
+        { url: schema.url, method: schema.method, infinite: true },
+        parameters as never,
+      ] as const,
       queryFn:
         options?.queryFn ??
         function ({ queryKey: [, queryParams], signal, meta, pageParam }) {

package/src/callbacks/useSuspenseQuery.ts

@@ -31,7 +31,7 @@ export const useSuspenseQuery: <
     >['useSuspenseQuery']
   >
 ) => UseQueryResult<TData, TError> = (qraftOptions, schema, args) => {
-  const [params, options, ...restArgs] = args;
+  const [parameters, options, ...restArgs] = args;
 
   const requestClient = useContext(qraftOptions?.context ?? QraftContext)
     ?.requestClient;
@@ -39,8 +39,8 @@ export const useSuspenseQuery: <
   if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
 
   const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> = [
-    { url: schema.url },
-    params,
+    { url: schema.url, method: schema.method },
+    parameters,
   ];
 
   return useSuspenseQueryTanstack(

package/src/qraftAPIClient.ts

@@ -9,20 +9,10 @@ export type QraftClientOptions = {
 };
 
 export const qraftAPIClient = <
-  Services extends {
-    [service in keyof Services]: {
-      [method in keyof Services[service]]: { schema: RequestClientSchema };
-    };
-  },
-  Callbacks extends Record<string, (...rest: any[]) => any>,
+  Services extends ServicesOutput<Services>,
+  Callbacks extends ServicesCallbacks,
 >(
-  services: {
-    [service in keyof Services]: {
-      [method in keyof Services[service]]: {
-        schema: Services[service][method]['schema'];
-      };
-    };
-  },
+  services: ServicesDeclaration<Services>,
   callbacks: Callbacks,
   options?: QraftClientOptions
 ): ServicesCallbacksFilter<Services, keyof Callbacks> => {
@@ -59,7 +49,26 @@ function getByPath(obj: Record<string, unknown>, path: string[]) {
   }, obj);
 }
 
-type ServicesCallbacksFilter<Services, Callbacks> = Services extends {
+type ServicesOutput<Services> = {
+  [service in keyof Services]: {
+    [method in keyof Services[service]]: { schema: RequestClientSchema };
+  };
+};
+
+type ServicesDeclaration<Services extends ServicesOutput<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: RequestClientSchema };
   };
@@ -68,7 +77,10 @@ type ServicesCallbacksFilter<Services, Callbacks> = Services extends {
       [serviceName in keyof Services]: {
         [method in keyof Services[serviceName]]: Pick<
           Services[serviceName][method],
-          FilterKeys<keyof Services[serviceName][method], Callbacks | 'schema'>
+          FilterKeys<
+            keyof Services[serviceName][method],
+            Callbacks | 'schema' | 'types'
+          >
         >;
       };
     }

package/src/lib/composeMutationKey.test.ts

@@ -1,43 +0,0 @@
-import { composeMutationKey } from './composeMutationKey.js';
-
-describe('composeMutationKey', () => {
-  it('should return mutation key with parameters', () => {
-    const schema = {
-      url: 'https://example.com',
-      method: 'get',
-    } as const;
-
-    const parameters = {
-      body: 'body',
-      requestBody: 'requestBody',
-      other: 'other',
-    };
-    const result = composeMutationKey(schema, parameters);
-
-    expect(result).toEqual([
-      {
-        url: schema.url,
-        method: schema.method,
-      },
-      {
-        other: 'other',
-      },
-    ]);
-  });
-
-  it('should return mutation key without parameters', () => {
-    const schema = {
-      url: 'https://example.com',
-      method: 'get',
-    } as const;
-
-    const result = composeMutationKey(schema, undefined);
-
-    expect(result).toEqual([
-      {
-        url: schema.url,
-        method: schema.method,
-      },
-    ]);
-  });
-});