@openapi-qraft/react 1.6.0 → 1.8.0

package/src/callbacks/cancelQueries.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationCancelQueriesCallback } from '../ServiceOperation.js';
+import type { ServiceOperationCancelQueriesCallback } from '../service-operation/ServiceOperationCancelQueries.js';
 
 export function cancelQueries<TData>(
   qraftOptions: QraftClientOptions | undefined,

package/src/callbacks/fetchInfiniteQuery.ts

@@ -1,6 +1,6 @@
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const fetchInfiniteQuery: <
   TSchema extends { url: string; method: 'get' | 'head' | 'options' },

package/src/callbacks/fetchQuery.ts

@@ -1,6 +1,6 @@
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const fetchQuery: <
   TSchema extends { url: string; method: 'get' | 'head' | 'options' },

package/src/callbacks/getInfiniteQueryData.ts

@@ -3,7 +3,7 @@ import type { InfiniteData } from '@tanstack/query-core';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export function getInfiniteQueryData<TData>(
   _: QraftClientOptions | undefined,

package/src/callbacks/getInfiniteQueryKey.ts

@@ -1,7 +1,7 @@
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const getInfiniteQueryKey = (
   qraftOptions: QraftClientOptions | undefined,

package/src/callbacks/getInfiniteQueryState.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export function getInfiniteQueryState<TData>(
   _: QraftClientOptions | undefined,

package/src/callbacks/getMutationKey.ts

@@ -1,7 +1,7 @@
 import { composeMutationKey } from '../lib/composeMutationKey.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationMutation } from '../ServiceOperation.js';
+import { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 
 export const getMutationKey = (
   qraftOptions: QraftClientOptions | undefined,

package/src/callbacks/getQueriesData.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export function getQueriesData<TData>(
   _: QraftClientOptions | undefined,

package/src/callbacks/getQueryData.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export function getQueryData<TData>(
   _: QraftClientOptions | undefined,

package/src/callbacks/getQueryKey.ts

@@ -1,7 +1,7 @@
 import { composeQueryKey } from '../lib/composeQueryKey.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const getQueryKey = (
   qraftOptions: QraftClientOptions | undefined,

package/src/callbacks/getQueryState.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export function getQueryState<TData>(
   _: QraftClientOptions | undefined,

package/src/callbacks/invalidateQueries.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationInvalidateQueriesCallback } from '../ServiceOperation.js';
+import type { ServiceOperationInvalidateQueriesCallback } from '../service-operation/ServiceOperationInvalidateQueries.js';
 
 export function invalidateQueries<TData>(
   qraftOptions: QraftClientOptions | undefined,

package/src/callbacks/isFetching.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationIsFetchingQueriesCallback } from '../ServiceOperation.js';
+import type { ServiceOperationIsFetchingQueriesCallback } from '../service-operation/ServiceOperationIsFetchingQueries.js';
 
 export function isFetching<TData>(
   qraftOptions: QraftClientOptions | undefined,

package/src/callbacks/isMutating.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithMutationFilters } from '../lib/callQueryClientMethodWithMutationFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationIsMutatingQueriesCallback } from '../ServiceOperation.js';
+import type { ServiceOperationIsMutatingQueriesCallback } from '../service-operation/ServiceOperationIsMutatingQueries.js';
 
 export function isMutating<TData>(
   _: QraftClientOptions | undefined,

package/src/callbacks/mutationFn.ts

@@ -1,6 +1,6 @@
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationMutation } from '../ServiceOperation.js';
+import { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 
 export const mutationFn = (
   qraftOptions: QraftClientOptions | undefined,
@@ -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/prefetchInfiniteQuery.ts

@@ -1,6 +1,6 @@
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const prefetchInfiniteQuery: <
   TSchema extends { url: string; method: 'get' | 'head' | 'options' },

package/src/callbacks/prefetchQuery.ts

@@ -1,6 +1,6 @@
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const prefetchQuery: <
   TSchema extends { url: string; method: 'get' | 'head' | 'options' },

package/src/callbacks/queryFn.ts

@@ -1,5 +1,5 @@
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const queryFn: <
   TSchema extends { url: string; method: 'get' | 'head' | 'options' },
@@ -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/refetchQueries.ts

@@ -1,13 +1,13 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationResetQueriesCallback } from '../ServiceOperation.js';
+import type { ServiceOperationRefetchQueriesCallback } from '../service-operation/ServiceOperationRefetchQueries.js';
 
 export function refetchQueries<TData>(
   qraftOptions: QraftClientOptions | undefined,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationResetQueriesCallback<
+    ServiceOperationRefetchQueriesCallback<
       OperationSchema,
       unknown,
       TData

package/src/callbacks/removeQueries.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationRemoveQueriesCallback } from '../ServiceOperation.js';
+import type { ServiceOperationRemoveQueriesCallback } from '../service-operation/ServiceOperationRemoveQueries.js';
 
 export function removeQueries<TData>(
   _: QraftClientOptions | undefined,

package/src/callbacks/resetQueries.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationResetQueriesCallback } from '../ServiceOperation.js';
+import type { ServiceOperationResetQueriesCallback } from '../service-operation/ServiceOperationResetQueries.js';
 
 export function resetQueries<TData>(
   qraftOptions: QraftClientOptions | undefined,

package/src/callbacks/setInfiniteQueryData.ts

@@ -3,7 +3,7 @@ import { InfiniteData } from '@tanstack/query-core';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export function setInfiniteQueryData<TData>(
   qraftOptions: QraftClientOptions | undefined,

package/src/callbacks/setQueriesData.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationSetQueriesDataCallback } from '../ServiceOperation.js';
+import type { ServiceOperationSetQueriesDataCallback } from '../service-operation/ServiceOperationSetQueriesData.js';
 
 export function setQueriesData<TData>(
   _: QraftClientOptions | undefined,

package/src/callbacks/setQueryData.ts

@@ -1,7 +1,7 @@
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationSetQueryDataCallback } from '../ServiceOperation.js';
+import type { ServiceOperationSetQueryDataCallback } from '../service-operation/ServiceOperationSetQueryData.js';
 
 export function setQueryData<TData>(
   _: QraftClientOptions | undefined,

package/src/callbacks/useInfiniteQuery.ts

@@ -9,7 +9,7 @@ import {
 import type { OperationSchema } from '../lib/requestFn.js';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const useInfiniteQuery: <
   TQueryFnData,
@@ -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/useIsFetching.ts

@@ -6,7 +6,7 @@ import { composeQueryFilters } from '../lib/composeQueryFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const useIsFetching: <TVariables = unknown>(
   qraftOptions: QraftClientOptions | undefined,

package/src/callbacks/useIsMutating.ts

@@ -10,7 +10,7 @@ import { composeMutationFilters } from '../lib/composeMutationFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationMutation } from '../ServiceOperation.js';
+import { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 
 export const useIsMutating: <
   TData = unknown,

package/src/callbacks/useMutation.ts

@@ -13,10 +13,8 @@ import type { OperationSchema } from '../lib/requestFn.js';
 import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { QraftContext } from '../QraftContext.js';
-import {
-  ServiceOperationMutation,
-  ServiceOperationMutationKey,
-} from '../ServiceOperation.js';
+import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
+import type { ServiceOperationMutationKey } from '../service-operation/ServiceOperationKey.js';
 
 export const useMutation: <
   TData = unknown,

package/src/callbacks/useMutationState.ts

@@ -10,7 +10,7 @@ import { composeMutationFilters } from '../lib/composeMutationFilters.js';
 import type { OperationSchema } from '../lib/requestFn.js';
 import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationMutation } from '../ServiceOperation.js';
+import { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 
 export const useMutationState: <
   TData = unknown,

package/src/callbacks/useQueries.ts

@@ -12,7 +12,7 @@ import type { OperationSchema } from '../lib/requestFn.js';
 import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { QraftContext } from '../QraftContext.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const useQueries: (
   qraftOptions: QraftClientOptions | undefined,
@@ -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

@@ -9,7 +9,7 @@ import {
 import type { OperationSchema } from '../lib/requestFn.js';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const useQuery: <TData = unknown, TError = DefaultError>(
   qraftOptions: QraftClientOptions | undefined,
@@ -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

@@ -9,7 +9,7 @@ import {
 import type { OperationSchema } from '../lib/requestFn.js';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const useSuspenseInfiniteQuery: <
   TQueryFnData,
@@ -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

@@ -12,7 +12,7 @@ import type { OperationSchema } from '../lib/requestFn.js';
 import { useQueryClient } from '../lib/useQueryClient.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import { QraftContext } from '../QraftContext.js';
-import { ServiceOperationQuery } from '../ServiceOperation.js';
+import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const useSuspenseQueries: (
   qraftOptions: QraftClientOptions | undefined,
@@ -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

@@ -9,7 +9,7 @@ import {
 import type { OperationSchema } from '../lib/requestFn.js';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../ServiceOperation.js';
+import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const useSuspenseQuery: <
   TQueryFnData = unknown,
@@ -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/index.ts

@@ -10,7 +10,4 @@ export {
   type RequestFnOptions,
   type HeadersOptions,
 } from './lib/requestFn.js';
-export type {
-  ServiceOperationQuery,
-  ServiceOperationMutation,
-} from './ServiceOperation.js';
+export * from './service-operation/index.js';

package/src/lib/PartialParameters.type.ts

@@ -0,0 +1,12 @@
+/**
+ * Shallow partial 'parameters'.
+ * @example
+ * ```ts
+ * {query?: {page: number, nested: {still: 'not_partial'}}}
+ * // =>
+ * {query?: {page?: number, nested?: {still: 'not_partial'}}}
+ * ```
+ */
+export type PartialParameters<T> = T extends object
+  ? { [K in keyof T]?: T[K] extends object ? Partial<T[K]> : T[K] }
+  : T;

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/composeBaseQueryKey.ts

@@ -1,7 +1,7 @@
-import {
+import type {
   ServiceOperationInfiniteQueryKey,
   ServiceOperationQueryKey,
-} from '../ServiceOperation.js';
+} from '../service-operation/ServiceOperationKey.js';
 import type { OperationSchema } from './requestFn.js';
 
 export function composeBaseQueryKey<TSchema extends OperationSchema, TParams>(

package/src/lib/composeInfiniteQueryKey.ts

@@ -1,4 +1,4 @@
-import type { ServiceOperationInfiniteQueryKey } from '../ServiceOperation.js';
+import type { ServiceOperationInfiniteQueryKey } from '../service-operation/ServiceOperationKey.js';
 import { composeBaseQueryKey } from './composeBaseQueryKey.js';
 import type { OperationSchema } from './requestFn.js';
 

package/src/lib/composeMutationKey.ts

@@ -1,14 +1,11 @@
-import type { ServiceOperationMutationKey } from '../ServiceOperation.js';
+import type { ServiceOperationMutationKey } from '../service-operation/ServiceOperationKey.js';
 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/composeQueryKey.ts

@@ -1,4 +1,4 @@
-import type { ServiceOperationQueryKey } from '../ServiceOperation.js';
+import type { ServiceOperationQueryKey } from '../service-operation/ServiceOperationKey.js';
 import { composeBaseQueryKey } from './composeBaseQueryKey.js';
 import type { OperationSchema } from './requestFn.js';