@squonk/account-server-client 4.4.0-4-4.2197467763 → 4.4.0-4-4.2200269934

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

@@ -10,11 +10,15 @@ A service that provides access to the Account Server, which gives *registered* u
  */
 import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
+  DataTag,
+  DefinedInitialDataOptions,
+  DefinedUseQueryResult,
   InvalidateOptions,
   MutationFunction,
   QueryClient,
   QueryFunction,
   QueryKey,
+  UndefinedInitialDataOptions,
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
@@ -65,7 +69,7 @@ export const getGetUserAccountQueryOptions = <
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | AsError>,
 >(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>;
+  query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>>;
   request?: SecondParameter<typeof customFetch>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -79,12 +83,58 @@ export const getGetUserAccountQueryOptions = <
     Awaited<ReturnType<typeof getUserAccount>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetUserAccountQueryResult = NonNullable<Awaited<ReturnType<typeof getUserAccount>>>;
 export type GetUserAccountQueryError = ErrorType<void | AsError>;
 
+export function useGetUserAccount<
+  TData = Awaited<ReturnType<typeof getUserAccount>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getUserAccount>>,
+          TError,
+          Awaited<ReturnType<typeof getUserAccount>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetUserAccount<
+  TData = Awaited<ReturnType<typeof getUserAccount>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getUserAccount>>,
+          TError,
+          Awaited<ReturnType<typeof getUserAccount>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetUserAccount<
+  TData = Awaited<ReturnType<typeof getUserAccount>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Get information about your account
  */
@@ -92,13 +142,18 @@ export type GetUserAccountQueryError = ErrorType<void | AsError>;
 export function useGetUserAccount<
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | AsError>,
->(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>;
-  request?: SecondParameter<typeof customFetch>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetUserAccountQueryOptions(options);
 
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData>;
+  };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -121,7 +176,9 @@ export const getGetUserAccountSuspenseQueryOptions = <
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | AsError>,
 >(options?: {
-  query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>;
+  query?: Partial<
+    UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>
+  >;
   request?: SecondParameter<typeof customFetch>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -135,7 +192,7 @@ export const getGetUserAccountSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUserAccount>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetUserAccountSuspenseQueryResult = NonNullable<
@@ -143,6 +200,42 @@ export type GetUserAccountSuspenseQueryResult = NonNullable<
 >;
 export type GetUserAccountSuspenseQueryError = ErrorType<void | AsError>;
 
+export function useGetUserAccountSuspense<
+  TData = Awaited<ReturnType<typeof getUserAccount>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetUserAccountSuspense<
+  TData = Awaited<ReturnType<typeof getUserAccount>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetUserAccountSuspense<
+  TData = Awaited<ReturnType<typeof getUserAccount>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Get information about your account
  */
@@ -150,15 +243,21 @@ export type GetUserAccountSuspenseQueryError = ErrorType<void | AsError>;
 export function useGetUserAccountSuspense<
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | AsError>,
->(options?: {
-  query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>;
-  request?: SecondParameter<typeof customFetch>;
-}): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUserAccount>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetUserAccountSuspenseQueryOptions(options);
 
-  const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData> };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -219,7 +318,9 @@ export const getGetOrganisationUsersQueryOptions = <
 >(
   orgId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>;
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -234,7 +335,7 @@ export const getGetOrganisationUsersQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationUsers>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetOrganisationUsersQueryResult = NonNullable<
@@ -242,6 +343,61 @@ export type GetOrganisationUsersQueryResult = NonNullable<
 >;
 export type GetOrganisationUsersQueryError = ErrorType<AsError | void>;
 
+export function useGetOrganisationUsers<
+  TData = Awaited<ReturnType<typeof getOrganisationUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  orgId: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getOrganisationUsers>>,
+          TError,
+          Awaited<ReturnType<typeof getOrganisationUsers>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationUsers<
+  TData = Awaited<ReturnType<typeof getOrganisationUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getOrganisationUsers>>,
+          TError,
+          Awaited<ReturnType<typeof getOrganisationUsers>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationUsers<
+  TData = Awaited<ReturnType<typeof getOrganisationUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets users in an Organisation
  */
@@ -252,13 +408,18 @@ export function useGetOrganisationUsers<
 >(
   orgId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>;
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetOrganisationUsersQueryOptions(orgId, options);
 
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData>;
+  };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -287,10 +448,8 @@ export const getGetOrganisationUsersSuspenseQueryOptions = <
 >(
   orgId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<
-      Awaited<ReturnType<typeof getOrganisationUsers>>,
-      TError,
-      TData
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
@@ -306,7 +465,7 @@ export const getGetOrganisationUsersSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationUsers>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetOrganisationUsersSuspenseQueryResult = NonNullable<
@@ -314,6 +473,45 @@ export type GetOrganisationUsersSuspenseQueryResult = NonNullable<
 >;
 export type GetOrganisationUsersSuspenseQueryError = ErrorType<AsError | void>;
 
+export function useGetOrganisationUsersSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisationUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  orgId: string,
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationUsersSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisationUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationUsersSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisationUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets users in an Organisation
  */
@@ -324,19 +522,19 @@ export function useGetOrganisationUsersSuspense<
 >(
   orgId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<
-      Awaited<ReturnType<typeof getOrganisationUsers>>,
-      TError,
-      TData
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetOrganisationUsersSuspenseQueryOptions(orgId, options);
 
-  const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData> };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -431,18 +629,18 @@ export type AddOrganisationUserMutationError = ErrorType<AsError | void>;
 /**
  * @summary Adds a User to an Organisation
  */
-export const useAddOrganisationUser = <
-  TError = ErrorType<AsError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof addOrganisationUser>>,
-    TError,
-    { orgId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationResult<
+export const useAddOrganisationUser = <TError = ErrorType<AsError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof addOrganisationUser>>,
+      TError,
+      { orgId: string; userId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof addOrganisationUser>>,
   TError,
   { orgId: string; userId: string },
@@ -450,7 +648,7 @@ export const useAddOrganisationUser = <
 > => {
   const mutationOptions = getAddOrganisationUserMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Removes a User from an **Organisation**.
@@ -540,18 +738,18 @@ export type DeleteOrganisationUserMutationError = ErrorType<AsError | void>;
 /**
  * @summary Deletes a User from an Organisation
  */
-export const useDeleteOrganisationUser = <
-  TError = ErrorType<AsError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteOrganisationUser>>,
-    TError,
-    { orgId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationResult<
+export const useDeleteOrganisationUser = <TError = ErrorType<AsError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteOrganisationUser>>,
+      TError,
+      { orgId: string; userId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof deleteOrganisationUser>>,
   TError,
   { orgId: string; userId: string },
@@ -559,7 +757,7 @@ export const useDeleteOrganisationUser = <
 > => {
   const mutationOptions = getDeleteOrganisationUserMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Gets users in an Organisational Unit.
@@ -615,7 +813,9 @@ export const getGetOrganisationUnitUsersQueryOptions = <
 >(
   unitId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>;
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -631,7 +831,7 @@ export const getGetOrganisationUnitUsersQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetOrganisationUnitUsersQueryResult = NonNullable<
@@ -639,6 +839,61 @@ export type GetOrganisationUnitUsersQueryResult = NonNullable<
 >;
 export type GetOrganisationUnitUsersQueryError = ErrorType<AsError | void>;
 
+export function useGetOrganisationUnitUsers<
+  TData = Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  unitId: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
+          TError,
+          Awaited<ReturnType<typeof getOrganisationUnitUsers>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationUnitUsers<
+  TData = Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  unitId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
+          TError,
+          Awaited<ReturnType<typeof getOrganisationUnitUsers>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationUnitUsers<
+  TData = Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  unitId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets users in an Organisational Unit
  */
@@ -649,13 +904,18 @@ export function useGetOrganisationUnitUsers<
 >(
   unitId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>;
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetOrganisationUnitUsersQueryOptions(unitId, options);
 
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData>;
+  };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -684,10 +944,8 @@ export const getGetOrganisationUnitUsersSuspenseQueryOptions = <
 >(
   unitId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<
-      Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
-      TError,
-      TData
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
@@ -704,7 +962,7 @@ export const getGetOrganisationUnitUsersSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetOrganisationUnitUsersSuspenseQueryResult = NonNullable<
@@ -712,6 +970,45 @@ export type GetOrganisationUnitUsersSuspenseQueryResult = NonNullable<
 >;
 export type GetOrganisationUnitUsersSuspenseQueryError = ErrorType<AsError | void>;
 
+export function useGetOrganisationUnitUsersSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  unitId: string,
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationUnitUsersSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  unitId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationUnitUsersSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
+  TError = ErrorType<AsError | void>,
+>(
+  unitId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets users in an Organisational Unit
  */
@@ -722,19 +1019,19 @@ export function useGetOrganisationUnitUsersSuspense<
 >(
   unitId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<
-      Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
-      TError,
-      TData
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetOrganisationUnitUsersSuspenseQueryOptions(unitId, options);
 
-  const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData> };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -831,18 +1128,18 @@ export type AddOrganisationUnitUserMutationError = ErrorType<AsError | void>;
 /**
  * @summary Adds a user to an Organisational Unit
  */
-export const useAddOrganisationUnitUser = <
-  TError = ErrorType<AsError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof addOrganisationUnitUser>>,
-    TError,
-    { unitId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationResult<
+export const useAddOrganisationUnitUser = <TError = ErrorType<AsError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof addOrganisationUnitUser>>,
+      TError,
+      { unitId: string; userId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof addOrganisationUnitUser>>,
   TError,
   { unitId: string; userId: string },
@@ -850,7 +1147,7 @@ export const useAddOrganisationUnitUser = <
 > => {
   const mutationOptions = getAddOrganisationUnitUserMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Removes a User from an Organisational Unit.
@@ -945,15 +1242,18 @@ export type DeleteOrganisationUnitUserMutationError = ErrorType<AsError | void>;
 export const useDeleteOrganisationUnitUser = <
   TError = ErrorType<AsError | void>,
   TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteOrganisationUnitUser>>,
-    TError,
-    { unitId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationResult<
+>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteOrganisationUnitUser>>,
+      TError,
+      { unitId: string; userId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof deleteOrganisationUnitUser>>,
   TError,
   { unitId: string; userId: string },
@@ -961,5 +1261,5 @@ export const useDeleteOrganisationUnitUser = <
 > => {
   const mutationOptions = getDeleteOrganisationUnitUserMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };