@openapi-qraft/react 1.0.10 → 1.1.0

package/src/ServiceOperation.ts

@@ -1,12 +1,15 @@
 import {
   DefaultError,
+  FetchStatus,
   InfiniteData,
   InfiniteQueryPageParamsOptions,
+  InvalidateOptions,
   Mutation,
   MutationState,
   MutationStatus,
   NoInfer,
   QueriesPlaceholderDataFunction,
+  Query,
   QueryClient,
   SetDataOptions,
   Updater,
@@ -56,10 +59,11 @@ export interface ServiceOperationQuery<
     ServiceOperationUseSuspenseQueryQuery<TSchema, TData, TParams, TError>,
     ServiceOperationUseSuspenseInfiniteQuery<TSchema, TData, TParams, TError>,
     ServiceOperationQueryFn<TSchema, TData, TParams>,
-    ServiceOperationGetQueryData<TData, TParams>,
-    ServiceOperationGetInfiniteQueryData<TData, TParams>,
-    ServiceOperationSetQueryData<TData, TParams>,
-    ServiceOperationSetInfiniteQueryData<TData, TParams> {
+    ServiceOperationGetQueryData<TSchema, TData, TParams>,
+    ServiceOperationGetInfiniteQueryData<TSchema, TData, TParams>,
+    ServiceOperationSetQueryData<TSchema, TData, TParams>,
+    ServiceOperationSetInfiniteQueryData<TSchema, TData, TParams>,
+    ServiceOperationInvalidateQueries<TSchema, TData, TParams, TError> {
   schema: TSchema;
   types: {
     parameters: TParams;
@@ -74,12 +78,12 @@ interface ServiceOperationUseQuery<
   TParams = {},
   TError = DefaultError,
 > {
-  getQueryKey<QueryKeyParams extends TParams>(
-    parameters: QueryKeyParams
+  getQueryKey<QueryKeyParams extends TParams | undefined = undefined>(
+    parameters?: QueryKeyParams
   ): ServiceOperationQueryKey<TSchema, QueryKeyParams>;
 
   useQuery(
-    parameters: TParams,
+    parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
     options?: Omit<
       UndefinedInitialDataOptions<
         TData,
@@ -92,7 +96,7 @@ interface ServiceOperationUseQuery<
     queryClient?: QueryClient
   ): UseQueryResult<TData, TError | Error>;
   useQuery(
-    parameters: TParams,
+    parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
     options: Omit<
       DefinedInitialDataOptions<
         TData,
@@ -124,9 +128,11 @@ interface ServiceOperationUseQueries<
           >,
           'placeholderData' | 'suspense' | 'queryKey'
         > & {
-          parameters: TParams;
           placeholderData?: TData | QueriesPlaceholderDataFunction<TData>;
-        }
+        } & (
+            | { parameters: TParams }
+            | { queryKey: ServiceOperationQueryKey<TSchema, TParams> }
+          )
       >;
       combine?: (
         results: Array<UseQueryResult<TData, TError>>
@@ -136,6 +142,108 @@ interface ServiceOperationUseQueries<
   ): TCombinedResult;
 }
 
+type QueryTypeFilter = 'all' | 'active' | 'inactive';
+
+interface InvalidateQueryFiltersBase<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> {
+  /**
+   * Filter to active queries, inactive queries or all queries
+   */
+  type?: QueryTypeFilter;
+  /**
+   * Match query key exactly
+   */
+  exact?: boolean;
+  /**
+   * Include queries matching this predicate function
+   */
+  predicate?: (
+    query: Query<
+      TData,
+      TError,
+      TData,
+      | ServiceOperationQueryKey<TSchema, TParams>
+      | ServiceOperationInfiniteQueryKey<TSchema, TParams>
+    >
+  ) => boolean;
+  /**
+   * Include or exclude stale queries
+   */
+  stale?: boolean;
+  /**
+   * Include queries matching their fetchStatus
+   */
+  fetchStatus?: FetchStatus;
+
+  refetchType?: QueryTypeFilter | 'none';
+}
+
+interface InvalidateQueryFiltersByQueryKey<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> extends InvalidateQueryFiltersBase<TSchema, TData, TParams, TError> {
+  /**
+   * Include queries matching this query key
+   */
+  queryKey?: ServiceOperationQueryKey<TSchema, TParams>;
+}
+
+interface InvalidateQueryFiltersByParameters<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> extends InvalidateQueryFiltersBase<TSchema, TData, TParams, TError> {
+  /**
+   * Include queries matching parameters
+   */
+  parameters?: TParams;
+}
+
+interface ServiceOperationInvalidateQueries<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> {
+  invalidateQueries(
+    filters:
+      | InvalidateQueryFiltersByParameters<TSchema, TData, TParams, TError>
+      | InvalidateQueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+    options: InvalidateOptions,
+    queryClient: QueryClient
+  ): Promise<void>;
+  invalidateQueries(
+    filters:
+      | InvalidateQueryFiltersByParameters<TSchema, TData, TParams, TError>
+      | InvalidateQueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+    queryClient: QueryClient
+  ): Promise<void>;
+  invalidateQueries(queryClient: QueryClient): Promise<void>;
+}
+
+export interface ServiceOperationInvalidateQueriesCallback<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> extends ServiceOperationInvalidateQueries<TSchema, TData, TParams, TError> {
+  invalidateQueries(
+    filters:
+      | InvalidateQueryFiltersByParameters<TSchema, TData, TParams, TError>
+      | InvalidateQueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+      | QueryClient,
+    options?: InvalidateOptions | QueryClient,
+    queryClient?: QueryClient
+  ): Promise<void>;
+}
+
 interface ServiceOperationUseSuspenseQueries<
   TSchema extends { url: string; method: string },
   TData,
@@ -155,7 +263,11 @@ interface ServiceOperationUseSuspenseQueries<
             ServiceOperationQueryKey<TSchema, TParams>
           >,
           'queryKey'
-        > & { parameters: TParams }
+        > &
+          (
+            | { parameters: TParams }
+            | { queryKey: ServiceOperationQueryKey<TSchema, TParams> }
+          )
       >;
       combine?: (
         results: Array<UseSuspenseQueryResult<TData, TError>>
@@ -176,7 +288,7 @@ interface ServiceOperationUseInfiniteQuery<
   ): ServiceOperationInfiniteQueryKey<TSchema, TQueryKeyParams>;
 
   useInfiniteQuery<TPageParam extends TParams>(
-    parameters: TParams,
+    parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     options: Omit<
       UndefinedInitialDataInfiniteOptions<
         TData,
@@ -194,7 +306,7 @@ interface ServiceOperationUseInfiniteQuery<
     queryClient?: QueryClient
   ): UseInfiniteQueryResult<InfiniteData<TData>, TError | Error>;
   useInfiniteQuery<TPageParam extends TParams>(
-    parameters: TParams,
+    parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     options: Omit<
       DefinedInitialDataInfiniteOptions<
         TData,
@@ -220,7 +332,7 @@ interface ServiceOperationUseSuspenseInfiniteQuery<
   TError = DefaultError,
 > {
   useSuspenseInfiniteQuery<TPageParam extends TParams>(
-    parameters: TParams,
+    parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     options: Omit<
       UseSuspenseInfiniteQueryOptions<
         TData,
@@ -247,7 +359,7 @@ interface ServiceOperationUseSuspenseQueryQuery<
   TError = DefaultError,
 > {
   useSuspenseQuery(
-    parameters: TParams,
+    parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
     options?: Omit<
       UseSuspenseQueryOptions<
         TData,
@@ -269,8 +381,7 @@ export interface ServiceOperationMutation<
   TError = DefaultError,
 > extends ServiceOperationUseMutation<TSchema, TBody, TData, TParams, TError>,
     ServiceOperationUseMutationState<TSchema, TBody, TData, TParams, TError>,
-    ServiceOperationMutationFn<TSchema, TBody, TData, TParams>,
-    ServiceOperationSetQueryData<TData, TParams> {
+    ServiceOperationMutationFn<TSchema, TBody, TData, TParams> {
   schema: TSchema;
   types: {
     parameters: TParams;
@@ -489,18 +600,26 @@ interface ServiceOperationQueryFn<
   ): Promise<TData>;
 }
 
-interface ServiceOperationSetQueryData<TData, TParams = {}> {
+interface ServiceOperationSetQueryData<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {}, // todo::try to replace `TParams = {}` with `TParams = undefined`
+> {
   setQueryData(
-    parameters: TParams,
+    parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
     updater: Updater<NoInfer<TData> | undefined, NoInfer<TData> | undefined>,
     queryClient: QueryClient,
     options?: SetDataOptions
   ): TData | undefined;
 }
 
-interface ServiceOperationSetInfiniteQueryData<TData, TParams = {}> {
+interface ServiceOperationSetInfiniteQueryData<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+> {
   setInfiniteQueryData(
-    parameters: TParams,
+    parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     updater: Updater<
       NoInfer<InfiniteData<TData>> | undefined,
       NoInfer<InfiniteData<TData>> | undefined
@@ -510,16 +629,24 @@ interface ServiceOperationSetInfiniteQueryData<TData, TParams = {}> {
   ): InfiniteData<TData> | undefined;
 }
 
-interface ServiceOperationGetQueryData<TData, TParams = {}> {
+interface ServiceOperationGetQueryData<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+> {
   getQueryData(
-    parameters: TParams,
+    parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
     queryClient: QueryClient
   ): TData | undefined;
 }
 
-interface ServiceOperationGetInfiniteQueryData<TData, TParams = {}> {
+interface ServiceOperationGetInfiniteQueryData<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+> {
   getInfiniteQueryData(
-    parameters: TParams,
+    parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     queryClient: QueryClient
   ): InfiniteData<TData> | undefined;
 }

package/src/callbacks/getInfiniteQueryData.ts

@@ -1,5 +1,6 @@
 import { InfiniteData } from '@tanstack/query-core';
 
+import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import type { RequestClientSchema } from '../RequestClient.js';
 import {
@@ -19,8 +20,9 @@ export function getInfiniteQueryData<TData>(
   >
 ): InfiniteData<TData> | undefined {
   const [parameters, queryClient] = args;
-  return queryClient.getQueryData([
-    { url: schema.url, method: schema.method, infinite: true },
-    parameters,
-  ] satisfies ServiceOperationInfiniteQueryKey<RequestClientSchema, unknown>);
+  return queryClient.getQueryData(
+    Array.isArray(parameters)
+      ? parameters
+      : composeInfiniteQueryKey(schema, parameters)
+  );
 }

package/src/callbacks/getInfiniteQueryKey.ts

@@ -1,9 +1,7 @@
+import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import type { RequestClientSchema } from '../RequestClient.js';
-import {
-  ServiceOperationInfiniteQueryKey,
-  ServiceOperationQuery,
-} from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const getInfiniteQueryKey = (
   qraftOptions: QraftClientOptions | undefined,
@@ -16,8 +14,5 @@ export const getInfiniteQueryKey = (
     >['getInfiniteQueryKey']
   >
 ) => {
-  return [
-    { url: schema.url, method: schema.method, infinite: true },
-    args[0],
-  ] satisfies ServiceOperationInfiniteQueryKey<RequestClientSchema, unknown>;
+  return composeInfiniteQueryKey(schema, args[0]);
 };

package/src/callbacks/getQueryData.ts

@@ -1,9 +1,7 @@
+import { composeQueryKey } from '../lib/composeQueryKey.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import type { RequestClientSchema } from '../RequestClient.js';
-import {
-  ServiceOperationQuery,
-  ServiceOperationQueryKey,
-} from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export function getQueryData<TData>(
   qraftOptions: QraftClientOptions | undefined,
@@ -13,8 +11,7 @@ export function getQueryData<TData>(
   >
 ): TData | undefined {
   const [parameters, queryClient] = args;
-  return queryClient.getQueryData([
-    { url: schema.url, method: schema.method },
-    parameters,
-  ] satisfies ServiceOperationQueryKey<RequestClientSchema, unknown>);
+  return queryClient.getQueryData(
+    Array.isArray(parameters) ? parameters : composeQueryKey(schema, parameters)
+  );
 }

package/src/callbacks/getQueryKey.ts

@@ -1,9 +1,7 @@
+import { composeQueryKey } from '../lib/composeQueryKey.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import type { RequestClientSchema } from '../RequestClient.js';
-import {
-  ServiceOperationQuery,
-  ServiceOperationQueryKey,
-} from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const getQueryKey = (
   qraftOptions: QraftClientOptions | undefined,
@@ -12,8 +10,5 @@ export const getQueryKey = (
     ServiceOperationQuery<RequestClientSchema, unknown, unknown>['getQueryKey']
   >
 ) => {
-  return [
-    { url: schema.url, method: schema.method },
-    args[0],
-  ] satisfies ServiceOperationQueryKey<RequestClientSchema, unknown>;
+  return composeQueryKey(schema, args[0]);
 };

package/src/callbacks/invalidateQueries.ts

@@ -0,0 +1,70 @@
+import { InvalidateOptions } from '@tanstack/query-core';
+import { QueryClient } from '@tanstack/react-query';
+
+import { composeQueryKey } from '../lib/composeQueryKey.js';
+import type { QraftClientOptions } from '../qraftAPIClient.js';
+import type { RequestClientSchema } from '../RequestClient.js';
+import { ServiceOperationInvalidateQueriesCallback } from '../ServiceOperation.js';
+
+export function invalidateQueries<TData>(
+  qraftOptions: QraftClientOptions | undefined,
+  schema: RequestClientSchema,
+  args: Parameters<
+    ServiceOperationInvalidateQueriesCallback<
+      RequestClientSchema,
+      unknown,
+      TData
+    >['invalidateQueries']
+  >
+): Promise<void> {
+  const queryClient = (
+    args.length === 1
+      ? args[0]
+      : args.length === 2
+        ? args[1]
+        : args.length === 3
+          ? args[2]
+          : undefined
+  ) as QueryClient | undefined;
+
+  const filters = args.length === 1 ? undefined : args[0];
+  const options = (args.length === 3 ? args[1] : undefined) as
+    | InvalidateOptions
+    | undefined;
+
+  if (!queryClient) throw new Error('queryClient is required');
+  if (!queryClient.invalidateQueries) throw new Error('queryClient is invalid');
+
+  if (!filters) {
+    return queryClient.invalidateQueries(
+      {
+        queryKey: composeQueryKey(schema, undefined),
+      },
+      options
+    );
+  }
+
+  if ('queryKey' in filters) {
+    return queryClient.invalidateQueries(filters as never, options);
+  }
+
+  if ('parameters' in filters) {
+    const { parameters, ...filtersRest } = filters;
+
+    return queryClient.invalidateQueries(
+      {
+        ...filtersRest,
+        queryKey: composeQueryKey(schema, parameters),
+      } as never,
+      options
+    );
+  }
+
+  return queryClient.invalidateQueries(
+    {
+      ...filters,
+      queryKey: composeQueryKey(schema, undefined),
+    } as never,
+    options
+  );
+}

package/src/callbacks/setInfiniteQueryData.ts

@@ -1,5 +1,6 @@
 import { InfiniteData } from '@tanstack/query-core';
 
+import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import type { RequestClientSchema } from '../RequestClient.js';
 import type {
@@ -23,7 +24,9 @@ export function setInfiniteQueryData<TData>(
   const queryKey: ServiceOperationInfiniteQueryKey<
     RequestClientSchema,
     unknown
-  > = [{ url: schema.url, method: schema.method, infinite: true }, parameters];
+  > = Array.isArray(parameters)
+    ? parameters
+    : composeInfiniteQueryKey(schema, parameters);
 
   return queryClient.setQueryData(queryKey, updater as never, options);
 }

package/src/callbacks/setQueryData.ts

@@ -1,3 +1,4 @@
+import { composeQueryKey } from '../lib/composeQueryKey.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import type { RequestClientSchema } from '../RequestClient.js';
 import {
@@ -14,10 +15,10 @@ export function setQueryData<TData>(
 ): TData | undefined {
   const [parameters, updater, queryClient, options] = args;
 
-  const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> = [
-    { url: schema.url, method: schema.method },
-    parameters,
-  ];
+  const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> =
+    Array.isArray(parameters)
+      ? parameters
+      : composeQueryKey(schema, parameters);
 
   return queryClient.setQueryData(queryKey, updater as never, options);
 }

package/src/callbacks/useInfiniteQuery.ts

@@ -9,11 +9,15 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
+import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 import { shelfMerge } from '../lib/shelfMerge.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { QraftContext } from '../QraftContext.js';
 import type { RequestClientSchema } from '../RequestClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import {
+  ServiceOperationInfiniteQueryKey,
+  ServiceOperationQuery,
+} from '../ServiceOperation.js';
 
 export const useInfiniteQuery: <
   TQueryFnData,
@@ -37,13 +41,17 @@ export const useInfiniteQuery: <
 
   if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
 
+  const queryKey: ServiceOperationInfiniteQueryKey<
+    RequestClientSchema,
+    unknown
+  > = Array.isArray(parameters)
+    ? (parameters as never)
+    : composeInfiniteQueryKey(schema, parameters);
+
   return useInfiniteQueryBase(
     {
       ...options,
-      queryKey: [
-        { url: schema.url, method: schema.method, infinite: true },
-        parameters as never,
-      ] as const,
+      queryKey,
       queryFn:
         options?.queryFn ??
         function ({ queryKey: [, queryParams], signal, meta, pageParam }) {

package/src/callbacks/useQueries.ts

@@ -8,13 +8,11 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
+import { composeQueryKey } from '../lib/composeQueryKey.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { QraftContext } from '../QraftContext.js';
 import type { RequestClientSchema } from '../RequestClient.js';
-import {
-  ServiceOperationQuery,
-  ServiceOperationQueryKey,
-} from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../ServiceOperation.js';
 
 export const useQueries: (
   qraftOptions: QraftClientOptions | undefined,
@@ -33,22 +31,34 @@ export const useQueries: (
   return useQueriesTanstack(
     {
       ...options,
-      queries: options.queries.map(({ parameters, ...queryOptions }) => ({
-        ...queryOptions,
-        queryKey: [
-          { url: schema.url, method: schema.method },
-          parameters,
-        ] satisfies ServiceOperationQueryKey<RequestClientSchema, unknown>,
-        queryFn:
-          queryOptions.queryFn ??
-          function ({ queryKey: [, queryParams], signal, meta }) {
-            return requestClient(schema, {
-              parameters: queryParams as never,
-              signal,
-              meta,
-            });
-          },
-      })),
+      queries: options.queries.map((queryOptions) => {
+        const optionsWithQueryKey =
+          'parameters' in queryOptions
+            ? (() => {
+                const queryOptionsCopy = Object.assign(
+                  {
+                    queryKey: composeQueryKey(schema, queryOptions.parameters),
+                  },
+                  queryOptions
+                );
+                delete queryOptionsCopy.parameters;
+                return queryOptionsCopy;
+              })()
+            : queryOptions;
+
+        return {
+          ...optionsWithQueryKey,
+          queryFn:
+            optionsWithQueryKey.queryFn ??
+            function ({ queryKey: [, queryParams], signal, meta }) {
+              return requestClient(schema, {
+                parameters: queryParams as never,
+                signal,
+                meta,
+              });
+            },
+        };
+      }),
     },
     useQueryClient(queryClientByArg ?? queryClientByContext)
   ) as never;

package/src/callbacks/useQuery.ts

@@ -9,6 +9,7 @@ import {
   UseQueryResult,
 } from '@tanstack/react-query';
 
+import { composeQueryKey } from '../lib/composeQueryKey.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { QraftContext } from '../QraftContext.js';
 import type { RequestClientSchema } from '../RequestClient.js';
@@ -17,11 +18,7 @@ import {
   ServiceOperationQueryKey,
 } from '../ServiceOperation.js';
 
-export const useQuery: <
-  TQueryFnData = unknown,
-  TError = DefaultError,
-  TData = TQueryFnData,
->(
+export const useQuery: <TData = unknown, TError = DefaultError>(
   qraftOptions: QraftClientOptions | undefined,
   schema: RequestClientSchema,
   args: Parameters<
@@ -35,10 +32,10 @@ export const useQuery: <
 
   if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
 
-  const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> = [
-    { url: schema.url, method: schema.method },
-    parameters,
-  ];
+  const queryKey: ServiceOperationQueryKey<RequestClientSchema, unknown> =
+    Array.isArray(parameters)
+      ? (parameters as ServiceOperationQueryKey<RequestClientSchema, unknown>)
+      : composeQueryKey(schema, parameters);
 
   return useQueryTanstack(
     {

package/src/callbacks/useSuspenseInfiniteQuery.ts

@@ -9,11 +9,15 @@ import {
   UseSuspenseInfiniteQueryResult,
 } from '@tanstack/react-query';
 
+import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 import { shelfMerge } from '../lib/shelfMerge.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { QraftContext } from '../QraftContext.js';
 import type { RequestClientSchema } from '../RequestClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import {
+  ServiceOperationInfiniteQueryKey,
+  ServiceOperationQuery,
+} from '../ServiceOperation.js';
 
 export const useSuspenseInfiniteQuery: <
   TQueryFnData,
@@ -41,13 +45,17 @@ export const useSuspenseInfiniteQuery: <
 
   if (!requestClient) throw new Error(`QraftContext.requestClient not found`);
 
+  const queryKey: ServiceOperationInfiniteQueryKey<
+    RequestClientSchema,
+    unknown
+  > = Array.isArray(parameters)
+    ? (parameters as never)
+    : composeInfiniteQueryKey(schema, parameters);
+
   return useSuspenseInfiniteQueryTanstack(
     {
       ...options,
-      queryKey: [
-        { url: schema.url, method: schema.method, infinite: true },
-        parameters as never,
-      ] as const,
+      queryKey,
       queryFn:
         options?.queryFn ??
         function ({ queryKey: [, queryParams], signal, meta, pageParam }) {