TypeScript auto generated client hook types

[telam]

Hello,

I'm trying to write a custom hook that takes in multiple auto-generated query hooks and mutation hooks to reduce duplicate code in my codebase but I'm having a hard time writing a generic function type for the auto-generated client code. I looked through the documentation and didn't see any Generic types defined for the auto-generated clients. For context, my custom hook that takes in the query/mutation hooks is just doing basic CRUD operations required for one of my React components. I could abstract this into functions that are just used as the onSuccess/onMutate callbacks of the generated hooks instead of a custom hook. I am looking type definitions or for advice on how people are solving this code duplication issue.

Here was my first attempt at trying to create Generic types for the Kubb TypeScrpit read/mutate hooks

import client from "@kubb/swagger-client/client";

export type KubbQueryRequest = {
  data: never;
  error: never;
  request: never;
  pathParams: never;
  queryParams: never;
  headerParams: never;
  response: never;
  client: {
    parameters: Partial<Parameters<typeof client>[0]>;
    return: Awaited<ReturnType<typeof client>>;
  };
};

export type KubbQueryFunc = <TData, TQueryData, TQueryKey extends QueryKey>(
  params: KubbQueryRequest["queryParams"],
  options: {
    query?: Partial<
      QueryObserverOptions<
        KubbQueryRequest["response"],
        KubbQueryRequest["error"],
        TData,
        TQueryData,
        TQueryKey
      >
    >;
    client?: KubbQueryRequest["client"]["parameters"];
  } = {}
) => UseQueryResult<TData, KubbQueryRequest["error"]> & {
  queryKey: TQueryKey;
};

export type KubbMutateFunc = (options: {
  mutation?: UseMutationOptions<
    KubbQueryRequest["response"],
    KubbQueryRequest["error"],
    KubbQueryRequest["request"]
  >;
  client?: KubbQueryRequest["client"]["parameters"];
}) => ReturnType<useMutation>;

Thanks!