@squonk/data-manager-client 5.4.0 → 6.1.0

package/src/api/user/user.fetch.ts

@@ -1,26 +1,23 @@
 /**
- * Generated by orval v7.21.0 🍺
+ * Generated by orval v8.16.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
-
-A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
-
- * OpenAPI spec version: 5.4
+ *
+ * A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
+ *
+ * OpenAPI spec version: 6.1
  */
-import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
+import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
   DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   InvalidateOptions,
-  MutationFunction,
   QueryClient,
   QueryFunction,
   QueryKey,
   UndefinedInitialDataOptions,
-  UseMutationOptions,
-  UseMutationResult,
   UseQueryOptions,
   UseQueryResult,
   UseSuspenseQueryOptions,
@@ -36,18 +33,13 @@ import type {
   UserApiLogGetResponse,
   UserApiTokenGetResponse,
   UsersGetResponse,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customFetch } from "../../custom-fetch";
 import type { ErrorType } from "../../custom-fetch";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
-/**
- * Returns a summary of all users that have accessed the Data Manager API and where the account is not `private`. Users can set their accounts to be private and therefore will not show up in methods like this
-
- * @summary Get information about all known Users
- */
 export type getUsersResponse200 = { data: UsersGetResponse; status: 200 };
 
 export type getUsersResponse401 = { data: void; status: 401 };
@@ -65,6 +57,10 @@ export const getGetUsersUrl = () => {
   return `/user`;
 };
 
+/**
+ * Returns a summary of all users that have accessed the Data Manager API and where the account is not `private`. Users can set their accounts to be private and therefore will not show up in methods like this
+ * @summary Get information about all known Users
+ */
 export const getUsers = async (options?: RequestInit): Promise<getUsersResponse> => {
   return customFetch<getUsersResponse>(getGetUsersUrl(), { ...options, method: "GET" });
 };
@@ -91,7 +87,7 @@ export const getGetUsersQueryOptions = <
     Awaited<ReturnType<typeof getUsers>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUsersQueryResult = NonNullable<Awaited<ReturnType<typeof getUsers>>>;
@@ -114,7 +110,7 @@ export function useGetUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUsers<
   TData = Awaited<ReturnType<typeof getUsers>>,
   TError = ErrorType<void | DmError>,
@@ -132,7 +128,7 @@ export function useGetUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUsers<
   TData = Awaited<ReturnType<typeof getUsers>>,
   TError = ErrorType<void | DmError>,
@@ -142,7 +138,7 @@ export function useGetUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get information about all known Users
  */
@@ -156,16 +152,14 @@ export function useGetUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUsersQueryOptions(options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -198,7 +192,7 @@ export const getGetUsersSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUsers>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUsersSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getUsers>>>;
@@ -213,7 +207,7 @@ export function useGetUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUsersSuspense<
   TData = Awaited<ReturnType<typeof getUsers>>,
   TError = ErrorType<void | DmError>,
@@ -223,7 +217,7 @@ export function useGetUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUsersSuspense<
   TData = Awaited<ReturnType<typeof getUsers>>,
   TError = ErrorType<void | DmError>,
@@ -233,7 +227,7 @@ export function useGetUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get information about all known Users
  */
@@ -247,22 +241,17 @@ export function useGetUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUsersSuspenseQueryOptions(options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
-/**
- * @summary Get information about your account
- */
 export type getUserAccountResponse200 = { data: UserAccountDetail; status: 200 };
 
 export type getUserAccountResponse401 = { data: void; status: 401 };
@@ -282,7 +271,7 @@ export const getGetUserAccountUrl = (params?: GetUserAccountParams) => {
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -291,6 +280,9 @@ export const getGetUserAccountUrl = (params?: GetUserAccountParams) => {
   return stringifiedParams.length > 0 ? `/user/account?${stringifiedParams}` : `/user/account`;
 };
 
+/**
+ * @summary Get information about your account
+ */
 export const getUserAccount = async (
   params?: GetUserAccountParams,
   options?: RequestInit,
@@ -326,7 +318,7 @@ export const getGetUserAccountQueryOptions = <
     Awaited<ReturnType<typeof getUserAccount>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUserAccountQueryResult = NonNullable<Awaited<ReturnType<typeof getUserAccount>>>;
@@ -350,7 +342,7 @@ export function useGetUserAccount<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserAccount<
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | DmError>,
@@ -369,7 +361,7 @@ export function useGetUserAccount<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserAccount<
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | DmError>,
@@ -380,7 +372,7 @@ export function useGetUserAccount<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get information about your account
  */
@@ -395,16 +387,14 @@ export function useGetUserAccount<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUserAccountQueryOptions(params, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -443,7 +433,7 @@ export const getGetUserAccountSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUserAccount>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUserAccountSuspenseQueryResult = NonNullable<
@@ -463,7 +453,7 @@ export function useGetUserAccountSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserAccountSuspense<
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | DmError>,
@@ -476,7 +466,7 @@ export function useGetUserAccountSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserAccountSuspense<
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | DmError>,
@@ -489,7 +479,7 @@ export function useGetUserAccountSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get information about your account
  */
@@ -506,22 +496,17 @@ export function useGetUserAccountSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUserAccountSuspenseQueryOptions(params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
-/**
- * @summary Patch your account
- */
 export type patchUserAccountResponse204 = { data: void; status: 204 };
 
 export type patchUserAccountResponse401 = { data: void; status: 401 };
@@ -542,6 +527,9 @@ export const getPatchUserAccountUrl = () => {
   return `/user/account`;
 };
 
+/**
+ * @summary Patch your account
+ */
 export const patchUserAccount = async (
   userAccountPatchBodyBody?: UserAccountPatchBodyBody,
   options?: RequestInit,
@@ -571,77 +559,128 @@ export const patchUserAccount = async (
   });
 };
 
-export const getPatchUserAccountMutationOptions = <
+export const getPatchUserAccountQueryKey = (
+  userAccountPatchBodyBody?: UserAccountPatchBodyBody,
+) => {
+  return ["data-manager", "PATCH", "user", "account", userAccountPatchBodyBody] as const;
+};
+
+export const getPatchUserAccountQueryOptions = <
+  TData = Awaited<ReturnType<typeof patchUserAccount>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof patchUserAccount>>,
-    TError,
-    { data: UserAccountPatchBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof patchUserAccount>>,
-  TError,
-  { data: UserAccountPatchBodyBody },
-  TContext
-> => {
-  const mutationKey = ["patchUserAccount"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof patchUserAccount>>,
-    { data: UserAccountPatchBodyBody }
-  > = (props) => {
-    const { data } = props ?? {};
+>(
+  userAccountPatchBodyBody?: UserAccountPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchUserAccount>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return patchUserAccount(data, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getPatchUserAccountQueryKey(userAccountPatchBodyBody);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof patchUserAccount>>> = ({ signal }) =>
+    patchUserAccount(userAccountPatchBodyBody, { signal, ...requestOptions });
+
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof patchUserAccount>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type PatchUserAccountMutationResult = NonNullable<
-  Awaited<ReturnType<typeof patchUserAccount>>
->;
-export type PatchUserAccountMutationBody = UserAccountPatchBodyBody;
-export type PatchUserAccountMutationError = ErrorType<void | DmError>;
+export type PatchUserAccountQueryResult = NonNullable<Awaited<ReturnType<typeof patchUserAccount>>>;
+export type PatchUserAccountQueryError = ErrorType<void | DmError>;
 
+export function usePatchUserAccount<
+  TData = Awaited<ReturnType<typeof patchUserAccount>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userAccountPatchBodyBody: undefined | UserAccountPatchBodyBody,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchUserAccount>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof patchUserAccount>>,
+          TError,
+          Awaited<ReturnType<typeof patchUserAccount>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function usePatchUserAccount<
+  TData = Awaited<ReturnType<typeof patchUserAccount>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userAccountPatchBodyBody?: UserAccountPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchUserAccount>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof patchUserAccount>>,
+          TError,
+          Awaited<ReturnType<typeof patchUserAccount>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function usePatchUserAccount<
+  TData = Awaited<ReturnType<typeof patchUserAccount>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userAccountPatchBodyBody?: UserAccountPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchUserAccount>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Patch your account
  */
-export const usePatchUserAccount = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function usePatchUserAccount<
+  TData = Awaited<ReturnType<typeof patchUserAccount>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userAccountPatchBodyBody?: UserAccountPatchBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof patchUserAccount>>,
-      TError,
-      { data: UserAccountPatchBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchUserAccount>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof patchUserAccount>>,
-  TError,
-  { data: UserAccountPatchBodyBody },
-  TContext
-> => {
-  const mutationOptions = getPatchUserAccountMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Returns a summary of your API activity optionally filtered by date. The API log does not include the use of GET methods, and only contains records of potential state-changing calls made against the Data Manager using your account
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getPatchUserAccountQueryOptions(userAccountPatchBodyBody, options);
 
- * @summary Get the API call log recorded against your account
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Patch your account
  */
+export const invalidatePatchUserAccount = async (
+  queryClient: QueryClient,
+  userAccountPatchBodyBody?: UserAccountPatchBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getPatchUserAccountQueryKey(userAccountPatchBodyBody) },
+    options,
+  );
+
+  return queryClient;
+};
+
 export type getUserApiLogResponse200 = { data: UserApiLogGetResponse; status: 200 };
 
 export type getUserApiLogResponse401 = { data: void; status: 401 };
@@ -656,7 +695,7 @@ export const getGetUserApiLogUrl = (params?: GetUserApiLogParams) => {
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -665,6 +704,10 @@ export const getGetUserApiLogUrl = (params?: GetUserApiLogParams) => {
   return stringifiedParams.length > 0 ? `/user/api-log?${stringifiedParams}` : `/user/api-log`;
 };
 
+/**
+ * Returns a summary of your API activity optionally filtered by date. The API log does not include the use of GET methods, and only contains records of potential state-changing calls made against the Data Manager using your account
+ * @summary Get the API call log recorded against your account
+ */
 export const getUserApiLog = async (
   params?: GetUserApiLogParams,
   options?: RequestInit,
@@ -700,7 +743,7 @@ export const getGetUserApiLogQueryOptions = <
     Awaited<ReturnType<typeof getUserApiLog>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUserApiLogQueryResult = NonNullable<Awaited<ReturnType<typeof getUserApiLog>>>;
@@ -724,7 +767,7 @@ export function useGetUserApiLog<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserApiLog<
   TData = Awaited<ReturnType<typeof getUserApiLog>>,
   TError = ErrorType<void>,
@@ -743,7 +786,7 @@ export function useGetUserApiLog<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserApiLog<
   TData = Awaited<ReturnType<typeof getUserApiLog>>,
   TError = ErrorType<void>,
@@ -754,7 +797,7 @@ export function useGetUserApiLog<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get the API call log recorded against your account
  */
@@ -769,16 +812,14 @@ export function useGetUserApiLog<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUserApiLogQueryOptions(params, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -817,7 +858,7 @@ export const getGetUserApiLogSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUserApiLog>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUserApiLogSuspenseQueryResult = NonNullable<
@@ -837,7 +878,7 @@ export function useGetUserApiLogSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserApiLogSuspense<
   TData = Awaited<ReturnType<typeof getUserApiLog>>,
   TError = ErrorType<void>,
@@ -850,7 +891,7 @@ export function useGetUserApiLogSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserApiLogSuspense<
   TData = Awaited<ReturnType<typeof getUserApiLog>>,
   TError = ErrorType<void>,
@@ -863,7 +904,7 @@ export function useGetUserApiLogSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get the API call log recorded against your account
  */
@@ -880,24 +921,17 @@ export function useGetUserApiLogSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUserApiLogSuspenseQueryOptions(params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
-/**
- * Returns the API token assigned to your login
-
- * @summary Get your API token
- */
 export type getUserApiTokenResponse200 = { data: UserApiTokenGetResponse; status: 200 };
 
 export type getUserApiTokenResponse401 = { data: void; status: 401 };
@@ -911,6 +945,10 @@ export const getGetUserApiTokenUrl = () => {
   return `/user/token`;
 };
 
+/**
+ * Returns the API token assigned to your login
+ * @summary Get your API token
+ */
 export const getUserApiToken = async (options?: RequestInit): Promise<getUserApiTokenResponse> => {
   return customFetch<getUserApiTokenResponse>(getGetUserApiTokenUrl(), {
     ...options,
@@ -940,7 +978,7 @@ export const getGetUserApiTokenQueryOptions = <
     Awaited<ReturnType<typeof getUserApiToken>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUserApiTokenQueryResult = NonNullable<Awaited<ReturnType<typeof getUserApiToken>>>;
@@ -963,7 +1001,7 @@ export function useGetUserApiToken<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserApiToken<
   TData = Awaited<ReturnType<typeof getUserApiToken>>,
   TError = ErrorType<void>,
@@ -981,7 +1019,7 @@ export function useGetUserApiToken<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserApiToken<
   TData = Awaited<ReturnType<typeof getUserApiToken>>,
   TError = ErrorType<void>,
@@ -991,7 +1029,7 @@ export function useGetUserApiToken<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get your API token
  */
@@ -1005,16 +1043,14 @@ export function useGetUserApiToken<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUserApiTokenQueryOptions(options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -1049,7 +1085,7 @@ export const getGetUserApiTokenSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUserApiToken>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUserApiTokenSuspenseQueryResult = NonNullable<
@@ -1068,7 +1104,7 @@ export function useGetUserApiTokenSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserApiTokenSuspense<
   TData = Awaited<ReturnType<typeof getUserApiToken>>,
   TError = ErrorType<void>,
@@ -1080,7 +1116,7 @@ export function useGetUserApiTokenSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserApiTokenSuspense<
   TData = Awaited<ReturnType<typeof getUserApiToken>>,
   TError = ErrorType<void>,
@@ -1092,7 +1128,7 @@ export function useGetUserApiTokenSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get your API token
  */
@@ -1108,15 +1144,13 @@ export function useGetUserApiTokenSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUserApiTokenSuspenseQueryOptions(options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }