@squonk/account-server-client 4.1.0 → 4.1.1-rc.1

package/src/state/state.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
 /**
- * Generated by orval v7.2.0 🍺
+ * Generated by orval v7.4.1 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -14,6 +14,7 @@ import {
   useSuspenseQuery
 } from '@tanstack/react-query'
 import type {
+  DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   QueryFunction,
@@ -71,7 +72,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData> & { queryKey: QueryKey }
+   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
 }
 
 export type GetVersionQueryResult = NonNullable<Awaited<ReturnType<typeof getVersion>>>
@@ -87,7 +88,7 @@ export function useGetVersion<TData = Awaited<ReturnType<typeof getVersion>>, TE
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetVersion<TData = Awaited<ReturnType<typeof getVersion>>, TError = ErrorType<AsError | void>>(
   options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
@@ -97,11 +98,11 @@ export function useGetVersion<TData = Awaited<ReturnType<typeof getVersion>>, TE
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetVersion<TData = Awaited<ReturnType<typeof getVersion>>, TError = ErrorType<AsError | void>>(
   options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets the Account Server version
  */
@@ -109,11 +110,11 @@ export function useGetVersion<TData = Awaited<ReturnType<typeof getVersion>>, TE
 export function useGetVersion<TData = Awaited<ReturnType<typeof getVersion>>, TError = ErrorType<AsError | void>>(
   options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetVersionQueryOptions(options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -137,7 +138,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData> & { queryKey: QueryKey }
+   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
 }
 
 export type GetVersionSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getVersion>>>
@@ -147,15 +148,15 @@ export type GetVersionSuspenseQueryError = ErrorType<AsError | void>
 export function useGetVersionSuspense<TData = Awaited<ReturnType<typeof getVersion>>, TError = ErrorType<AsError | void>>(
   options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetVersionSuspense<TData = Awaited<ReturnType<typeof getVersion>>, TError = ErrorType<AsError | void>>(
   options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetVersionSuspense<TData = Awaited<ReturnType<typeof getVersion>>, TError = ErrorType<AsError | void>>(
   options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets the Account Server version
  */
@@ -163,11 +164,11 @@ export function useGetVersionSuspense<TData = Awaited<ReturnType<typeof getVersi
 export function useGetVersionSuspense<TData = Awaited<ReturnType<typeof getVersion>>, TError = ErrorType<AsError | void>>(
   options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetVersionSuspenseQueryOptions(options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 

package/src/unit/unit.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
 /**
- * Generated by orval v7.2.0 🍺
+ * Generated by orval v7.4.1 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -15,6 +15,7 @@ import {
   useSuspenseQuery
 } from '@tanstack/react-query'
 import type {
+  DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   MutationFunction,
@@ -85,7 +86,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, enabled: !!(orgId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData> & { queryKey: QueryKey }
+   return  { queryKey, queryFn, enabled: !!(orgId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
 }
 
 export type GetOrganisationUnitsQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisationUnits>>>
@@ -101,7 +102,7 @@ export function useGetOrganisationUnits<TData = Awaited<ReturnType<typeof getOrg
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetOrganisationUnits<TData = Awaited<ReturnType<typeof getOrganisationUnits>>, TError = ErrorType<void | AsError>>(
  orgId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
@@ -111,11 +112,11 @@ export function useGetOrganisationUnits<TData = Awaited<ReturnType<typeof getOrg
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetOrganisationUnits<TData = Awaited<ReturnType<typeof getOrganisationUnits>>, TError = ErrorType<void | AsError>>(
  orgId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets Organisational Units
  */
@@ -123,11 +124,11 @@ export function useGetOrganisationUnits<TData = Awaited<ReturnType<typeof getOrg
 export function useGetOrganisationUnits<TData = Awaited<ReturnType<typeof getOrganisationUnits>>, TError = ErrorType<void | AsError>>(
  orgId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetOrganisationUnitsQueryOptions(orgId,options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -151,7 +152,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, enabled: !!(orgId), ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData> & { queryKey: QueryKey }
+   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
 }
 
 export type GetOrganisationUnitsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisationUnits>>>
@@ -161,15 +162,15 @@ export type GetOrganisationUnitsSuspenseQueryError = ErrorType<void | AsError>
 export function useGetOrganisationUnitsSuspense<TData = Awaited<ReturnType<typeof getOrganisationUnits>>, TError = ErrorType<void | AsError>>(
  orgId: string, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetOrganisationUnitsSuspense<TData = Awaited<ReturnType<typeof getOrganisationUnits>>, TError = ErrorType<void | AsError>>(
  orgId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetOrganisationUnitsSuspense<TData = Awaited<ReturnType<typeof getOrganisationUnits>>, TError = ErrorType<void | AsError>>(
  orgId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets Organisational Units
  */
@@ -177,11 +178,11 @@ export function useGetOrganisationUnitsSuspense<TData = Awaited<ReturnType<typeo
 export function useGetOrganisationUnitsSuspense<TData = Awaited<ReturnType<typeof getOrganisationUnits>>, TError = ErrorType<void | AsError>>(
  orgId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetOrganisationUnitsSuspenseQueryOptions(orgId,options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -202,23 +203,29 @@ You need to be  a member of the **Organisation** or have administration rights t
 export const createOrganisationUnit = (
     orgId: string,
     organisationUnitPostBodyBody: OrganisationUnitPostBodyBody,
- options?: SecondParameter<typeof customInstance>,) => {
+ options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+) => {
       
       
       return customInstance<OrganisationUnitPostResponse>(
       {url: `/organisation/${orgId}/unit`, method: 'POST',
       headers: {'Content-Type': 'application/json', },
-      data: organisationUnitPostBodyBody
+      data: organisationUnitPostBodyBody, signal
     },
       options);
     }
   
 
 
-export const getCreateOrganisationUnitMutationOptions = <TError = ErrorType<AsError | void>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrganisationUnit>>, TError,{orgId: string;data: OrganisationUnitPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
-): UseMutationOptions<Awaited<ReturnType<typeof createOrganisationUnit>>, TError,{orgId: string;data: OrganisationUnitPostBodyBody}, TContext> => {
-const {mutation: mutationOptions, request: requestOptions} = options ?? {};
+export const getCreateOrganisationUnitMutationOptions = <TData = Awaited<ReturnType<typeof createOrganisationUnit>>, TError = ErrorType<AsError | void>,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{orgId: string;data: OrganisationUnitPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+) => {
+const mutationKey = ['createOrganisationUnit'];
+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};
 
       
 
@@ -232,7 +239,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{orgId: string;data: OrganisationUnitPostBodyBody}, TContext>}
 
     export type CreateOrganisationUnitMutationResult = NonNullable<Awaited<ReturnType<typeof createOrganisationUnit>>>
     export type CreateOrganisationUnitMutationBody = OrganisationUnitPostBodyBody
@@ -241,10 +248,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Create a new Organisational Unit
  */
-export const useCreateOrganisationUnit = <TError = ErrorType<AsError | void>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrganisationUnit>>, TError,{orgId: string;data: OrganisationUnitPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useCreateOrganisationUnit = <TData = Awaited<ReturnType<typeof createOrganisationUnit>>, TError = ErrorType<AsError | void>,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{orgId: string;data: OrganisationUnitPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof createOrganisationUnit>>,
+        TData,
         TError,
         {orgId: string;data: OrganisationUnitPostBodyBody},
         TContext
@@ -292,7 +299,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, enabled: !!(unitId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData> & { queryKey: QueryKey }
+   return  { queryKey, queryFn, enabled: !!(unitId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
 }
 
 export type GetUnitQueryResult = NonNullable<Awaited<ReturnType<typeof getUnit>>>
@@ -308,7 +315,7 @@ export function useGetUnit<TData = Awaited<ReturnType<typeof getUnit>>, TError =
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetUnit<TData = Awaited<ReturnType<typeof getUnit>>, TError = ErrorType<void | AsError>>(
  unitId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
@@ -318,11 +325,11 @@ export function useGetUnit<TData = Awaited<ReturnType<typeof getUnit>>, TError =
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetUnit<TData = Awaited<ReturnType<typeof getUnit>>, TError = ErrorType<void | AsError>>(
  unitId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets an Organisational Unit
  */
@@ -330,11 +337,11 @@ export function useGetUnit<TData = Awaited<ReturnType<typeof getUnit>>, TError =
 export function useGetUnit<TData = Awaited<ReturnType<typeof getUnit>>, TError = ErrorType<void | AsError>>(
  unitId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetUnitQueryOptions(unitId,options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -358,7 +365,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, enabled: !!(unitId), ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData> & { queryKey: QueryKey }
+   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
 }
 
 export type GetUnitSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getUnit>>>
@@ -368,15 +375,15 @@ export type GetUnitSuspenseQueryError = ErrorType<void | AsError>
 export function useGetUnitSuspense<TData = Awaited<ReturnType<typeof getUnit>>, TError = ErrorType<void | AsError>>(
  unitId: string, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetUnitSuspense<TData = Awaited<ReturnType<typeof getUnit>>, TError = ErrorType<void | AsError>>(
  unitId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetUnitSuspense<TData = Awaited<ReturnType<typeof getUnit>>, TError = ErrorType<void | AsError>>(
  unitId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets an Organisational Unit
  */
@@ -384,11 +391,11 @@ export function useGetUnitSuspense<TData = Awaited<ReturnType<typeof getUnit>>,
 export function useGetUnitSuspense<TData = Awaited<ReturnType<typeof getUnit>>, TError = ErrorType<void | AsError>>(
  unitId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetUnitSuspenseQueryOptions(unitId,options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -420,10 +427,15 @@ export const patchUnit = (
   
 
 
-export const getPatchUnitMutationOptions = <TError = ErrorType<void | AsError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof patchUnit>>, TError,{unitId: string;data: UnitPatchBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
-): UseMutationOptions<Awaited<ReturnType<typeof patchUnit>>, TError,{unitId: string;data: UnitPatchBodyBody}, TContext> => {
-const {mutation: mutationOptions, request: requestOptions} = options ?? {};
+export const getPatchUnitMutationOptions = <TData = Awaited<ReturnType<typeof patchUnit>>, TError = ErrorType<void | AsError>,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{unitId: string;data: UnitPatchBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+) => {
+const mutationKey = ['patchUnit'];
+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};
 
       
 
@@ -437,7 +449,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{unitId: string;data: UnitPatchBodyBody}, TContext>}
 
     export type PatchUnitMutationResult = NonNullable<Awaited<ReturnType<typeof patchUnit>>>
     export type PatchUnitMutationBody = UnitPatchBodyBody
@@ -446,10 +458,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Adjust an existing Unit
  */
-export const usePatchUnit = <TError = ErrorType<void | AsError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof patchUnit>>, TError,{unitId: string;data: UnitPatchBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const usePatchUnit = <TData = Awaited<ReturnType<typeof patchUnit>>, TError = ErrorType<void | AsError>,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{unitId: string;data: UnitPatchBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof patchUnit>>,
+        TData,
         TError,
         {unitId: string;data: UnitPatchBodyBody},
         TContext
@@ -481,10 +493,15 @@ export const deleteOrganisationUnit = (
   
 
 
-export const getDeleteOrganisationUnitMutationOptions = <TError = ErrorType<void | AsError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteOrganisationUnit>>, TError,{unitId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
-): UseMutationOptions<Awaited<ReturnType<typeof deleteOrganisationUnit>>, TError,{unitId: string}, TContext> => {
-const {mutation: mutationOptions, request: requestOptions} = options ?? {};
+export const getDeleteOrganisationUnitMutationOptions = <TData = Awaited<ReturnType<typeof deleteOrganisationUnit>>, TError = ErrorType<void | AsError>,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{unitId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+) => {
+const mutationKey = ['deleteOrganisationUnit'];
+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};
 
       
 
@@ -498,7 +515,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{unitId: string}, TContext>}
 
     export type DeleteOrganisationUnitMutationResult = NonNullable<Awaited<ReturnType<typeof deleteOrganisationUnit>>>
     
@@ -507,10 +524,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Deletes an Organisational Unit
  */
-export const useDeleteOrganisationUnit = <TError = ErrorType<void | AsError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteOrganisationUnit>>, TError,{unitId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useDeleteOrganisationUnit = <TData = Awaited<ReturnType<typeof deleteOrganisationUnit>>, TError = ErrorType<void | AsError>,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{unitId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof deleteOrganisationUnit>>,
+        TData,
         TError,
         {unitId: string},
         TContext
@@ -561,7 +578,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData> & { queryKey: QueryKey }
+   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
 }
 
 export type GetUnitsQueryResult = NonNullable<Awaited<ReturnType<typeof getUnits>>>
@@ -577,7 +594,7 @@ export function useGetUnits<TData = Awaited<ReturnType<typeof getUnits>>, TError
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetUnits<TData = Awaited<ReturnType<typeof getUnits>>, TError = ErrorType<void | AsError>>(
  params?: GetUnitsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>> & Pick<
         UndefinedInitialDataOptions<
@@ -587,11 +604,11 @@ export function useGetUnits<TData = Awaited<ReturnType<typeof getUnits>>, TError
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetUnits<TData = Awaited<ReturnType<typeof getUnits>>, TError = ErrorType<void | AsError>>(
  params?: GetUnitsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets Units
  */
@@ -599,11 +616,11 @@ export function useGetUnits<TData = Awaited<ReturnType<typeof getUnits>>, TError
 export function useGetUnits<TData = Awaited<ReturnType<typeof getUnits>>, TError = ErrorType<void | AsError>>(
  params?: GetUnitsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetUnitsQueryOptions(params,options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -627,7 +644,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData> & { queryKey: QueryKey }
+   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
 }
 
 export type GetUnitsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getUnits>>>
@@ -637,15 +654,15 @@ export type GetUnitsSuspenseQueryError = ErrorType<void | AsError>
 export function useGetUnitsSuspense<TData = Awaited<ReturnType<typeof getUnits>>, TError = ErrorType<void | AsError>>(
  params: undefined |  GetUnitsParams, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetUnitsSuspense<TData = Awaited<ReturnType<typeof getUnits>>, TError = ErrorType<void | AsError>>(
  params?: GetUnitsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 export function useGetUnitsSuspense<TData = Awaited<ReturnType<typeof getUnits>>, TError = ErrorType<void | AsError>>(
  params?: GetUnitsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets Units
  */
@@ -653,11 +670,11 @@ export function useGetUnitsSuspense<TData = Awaited<ReturnType<typeof getUnits>>
 export function useGetUnitsSuspense<TData = Awaited<ReturnType<typeof getUnits>>, TError = ErrorType<void | AsError>>(
  params?: GetUnitsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getGetUnitsSuspenseQueryOptions(params,options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -688,10 +705,15 @@ export const createDefaultUnit = (
   
 
 
-export const getCreateDefaultUnitMutationOptions = <TError = ErrorType<AsError | void>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createDefaultUnit>>, TError,{data: PersonalUnitPutBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
-): UseMutationOptions<Awaited<ReturnType<typeof createDefaultUnit>>, TError,{data: PersonalUnitPutBodyBody}, TContext> => {
-const {mutation: mutationOptions, request: requestOptions} = options ?? {};
+export const getCreateDefaultUnitMutationOptions = <TData = Awaited<ReturnType<typeof createDefaultUnit>>, TError = ErrorType<AsError | void>,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: PersonalUnitPutBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+) => {
+const mutationKey = ['createDefaultUnit'];
+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};
 
       
 
@@ -705,7 +727,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{data: PersonalUnitPutBodyBody}, TContext>}
 
     export type CreateDefaultUnitMutationResult = NonNullable<Awaited<ReturnType<typeof createDefaultUnit>>>
     export type CreateDefaultUnitMutationBody = PersonalUnitPutBodyBody
@@ -714,10 +736,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Create a new Personal Unit
  */
-export const useCreateDefaultUnit = <TError = ErrorType<AsError | void>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createDefaultUnit>>, TError,{data: PersonalUnitPutBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useCreateDefaultUnit = <TData = Awaited<ReturnType<typeof createDefaultUnit>>, TError = ErrorType<AsError | void>,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: PersonalUnitPutBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof createDefaultUnit>>,
+        TData,
         TError,
         {data: PersonalUnitPutBodyBody},
         TContext
@@ -745,10 +767,15 @@ export const deleteDefaultUnit = (
   
 
 
-export const getDeleteDefaultUnitMutationOptions = <TError = ErrorType<void | AsError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteDefaultUnit>>, TError,void, TContext>, request?: SecondParameter<typeof customInstance>}
-): UseMutationOptions<Awaited<ReturnType<typeof deleteDefaultUnit>>, TError,void, TContext> => {
-const {mutation: mutationOptions, request: requestOptions} = options ?? {};
+export const getDeleteDefaultUnitMutationOptions = <TData = Awaited<ReturnType<typeof deleteDefaultUnit>>, TError = ErrorType<void | AsError>,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,void, TContext>, request?: SecondParameter<typeof customInstance>}
+) => {
+const mutationKey = ['deleteDefaultUnit'];
+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};
 
       
 
@@ -762,7 +789,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,void, TContext>}
 
     export type DeleteDefaultUnitMutationResult = NonNullable<Awaited<ReturnType<typeof deleteDefaultUnit>>>
     
@@ -771,10 +798,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Deletes a Personal Unit
  */
-export const useDeleteDefaultUnit = <TError = ErrorType<void | AsError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteDefaultUnit>>, TError,void, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useDeleteDefaultUnit = <TData = Awaited<ReturnType<typeof deleteDefaultUnit>>, TError = ErrorType<void | AsError>,
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,void, TContext>, request?: SecondParameter<typeof customInstance>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof deleteDefaultUnit>>,
+        TData,
         TError,
         void,
         TContext