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

package/src/api/unit/unit.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,
@@ -91,7 +95,9 @@ export const getGetOrganisationUnitsQueryOptions = <
 >(
   orgId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>;
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -106,7 +112,7 @@ export const getGetOrganisationUnitsQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationUnits>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetOrganisationUnitsQueryResult = NonNullable<
@@ -114,6 +120,61 @@ export type GetOrganisationUnitsQueryResult = NonNullable<
 >;
 export type GetOrganisationUnitsQueryError = ErrorType<void | AsError>;
 
+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<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getOrganisationUnits>>,
+          TError,
+          Awaited<ReturnType<typeof getOrganisationUnits>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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<
+          Awaited<ReturnType<typeof getOrganisationUnits>>,
+          TError,
+          Awaited<ReturnType<typeof getOrganisationUnits>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Organisational Units
  */
@@ -124,13 +185,18 @@ export function useGetOrganisationUnits<
 >(
   orgId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>;
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetOrganisationUnitsQueryOptions(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;
 
@@ -159,10 +225,8 @@ export const getGetOrganisationUnitsSuspenseQueryOptions = <
 >(
   orgId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<
-      Awaited<ReturnType<typeof getOrganisationUnits>>,
-      TError,
-      TData
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
@@ -178,7 +242,7 @@ export const getGetOrganisationUnitsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationUnits>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetOrganisationUnitsSuspenseQueryResult = NonNullable<
@@ -186,6 +250,45 @@ export type GetOrganisationUnitsSuspenseQueryResult = NonNullable<
 >;
 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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Organisational Units
  */
@@ -196,19 +299,19 @@ export function useGetOrganisationUnitsSuspense<
 >(
   orgId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<
-      Awaited<ReturnType<typeof getOrganisationUnits>>,
-      TError,
-      TData
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetOrganisationUnitsSuspenseQueryOptions(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;
 
@@ -307,18 +410,18 @@ export type CreateOrganisationUnitMutationError = ErrorType<AsError | void>;
 /**
  * @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 customFetch>;
-}): UseMutationResult<
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof createOrganisationUnit>>,
   TError,
   { orgId: string; data: OrganisationUnitPostBodyBody },
@@ -326,7 +429,7 @@ export const useCreateOrganisationUnit = <
 > => {
   const mutationOptions = getCreateOrganisationUnitMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Gets a Unit. You can get a Unit if you are a member of it or are its creator. You can also get a Unit if you are a member of its **Organisation**, or its creator or an admin user.
@@ -368,7 +471,7 @@ export const getGetUnitQueryOptions = <
 >(
   unitId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -383,12 +486,61 @@ export const getGetUnitQueryOptions = <
     Awaited<ReturnType<typeof getUnit>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetUnitQueryResult = NonNullable<Awaited<ReturnType<typeof getUnit>>>;
 export type GetUnitQueryError = ErrorType<void | AsError>;
 
+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<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getUnit>>,
+          TError,
+          Awaited<ReturnType<typeof getUnit>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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<
+          Awaited<ReturnType<typeof getUnit>>,
+          TError,
+          Awaited<ReturnType<typeof getUnit>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets an Organisational Unit
  */
@@ -399,13 +551,16 @@ export function useGetUnit<
 >(
   unitId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetUnitQueryOptions(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;
 
@@ -431,7 +586,7 @@ export const getGetUnitSuspenseQueryOptions = <
 >(
   unitId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>;
+    query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -446,12 +601,45 @@ export const getGetUnitSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUnit>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetUnitSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getUnit>>>;
 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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets an Organisational Unit
  */
@@ -462,15 +650,17 @@ export function useGetUnitSuspense<
 >(
   unitId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>;
+    query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetUnitSuspenseQueryOptions(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;
 
@@ -561,15 +751,18 @@ export type PatchUnitMutationError = ErrorType<void | AsError>;
 /**
  * @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 customFetch>;
-}): UseMutationResult<
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof patchUnit>>,
   TError,
   { unitId: string; data: UnitPatchBodyBody },
@@ -577,7 +770,7 @@ export const usePatchUnit = <TError = ErrorType<void | AsError>, TContext = unkn
 > => {
   const mutationOptions = getPatchUnitMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Deletes an Organisational Unit you have access to. Units can only be deleted by members of the Unit, its Organisation users or admin users.
@@ -668,18 +861,18 @@ export type DeleteOrganisationUnitMutationError = ErrorType<void | AsError>;
 /**
  * @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 customFetch>;
-}): UseMutationResult<
+export const useDeleteOrganisationUnit = <TError = ErrorType<void | AsError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteOrganisationUnit>>,
+      TError,
+      { unitId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof deleteOrganisationUnit>>,
   TError,
   { unitId: string },
@@ -687,7 +880,7 @@ export const useDeleteOrganisationUnit = <
 > => {
   const mutationOptions = getDeleteOrganisationUnitMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * @summary Gets your Personal Unit (if you have one)
@@ -728,7 +921,7 @@ export const getGetPersonalUnitQueryOptions = <
   TData = Awaited<ReturnType<typeof getPersonalUnit>>,
   TError = ErrorType<void | AsError>,
 >(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>;
+  query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>>;
   request?: SecondParameter<typeof customFetch>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -742,12 +935,58 @@ export const getGetPersonalUnitQueryOptions = <
     Awaited<ReturnType<typeof getPersonalUnit>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetPersonalUnitQueryResult = NonNullable<Awaited<ReturnType<typeof getPersonalUnit>>>;
 export type GetPersonalUnitQueryError = ErrorType<void | AsError>;
 
+export function useGetPersonalUnit<
+  TData = Awaited<ReturnType<typeof getPersonalUnit>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getPersonalUnit>>,
+          TError,
+          Awaited<ReturnType<typeof getPersonalUnit>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetPersonalUnit<
+  TData = Awaited<ReturnType<typeof getPersonalUnit>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getPersonalUnit>>,
+          TError,
+          Awaited<ReturnType<typeof getPersonalUnit>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetPersonalUnit<
+  TData = Awaited<ReturnType<typeof getPersonalUnit>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets your Personal Unit (if you have one)
  */
@@ -755,13 +994,18 @@ export type GetPersonalUnitQueryError = ErrorType<void | AsError>;
 export function useGetPersonalUnit<
   TData = Awaited<ReturnType<typeof getPersonalUnit>>,
   TError = ErrorType<void | AsError>,
->(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>;
-  request?: SecondParameter<typeof customFetch>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetPersonalUnitQueryOptions(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;
 
@@ -784,7 +1028,9 @@ export const getGetPersonalUnitSuspenseQueryOptions = <
   TData = Awaited<ReturnType<typeof getPersonalUnit>>,
   TError = ErrorType<void | AsError>,
 >(options?: {
-  query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>;
+  query?: Partial<
+    UseSuspenseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>
+  >;
   request?: SecondParameter<typeof customFetch>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -798,7 +1044,7 @@ export const getGetPersonalUnitSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getPersonalUnit>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetPersonalUnitSuspenseQueryResult = NonNullable<
@@ -806,6 +1052,42 @@ export type GetPersonalUnitSuspenseQueryResult = NonNullable<
 >;
 export type GetPersonalUnitSuspenseQueryError = ErrorType<void | AsError>;
 
+export function useGetPersonalUnitSuspense<
+  TData = Awaited<ReturnType<typeof getPersonalUnit>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetPersonalUnitSuspense<
+  TData = Awaited<ReturnType<typeof getPersonalUnit>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetPersonalUnitSuspense<
+  TData = Awaited<ReturnType<typeof getPersonalUnit>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets your Personal Unit (if you have one)
  */
@@ -813,15 +1095,21 @@ export type GetPersonalUnitSuspenseQueryError = ErrorType<void | AsError>;
 export function useGetPersonalUnitSuspense<
   TData = Awaited<ReturnType<typeof getPersonalUnit>>,
   TError = ErrorType<void | AsError>,
->(options?: {
-  query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>;
-  request?: SecondParameter<typeof customFetch>;
-}): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getPersonalUnit>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetPersonalUnitSuspenseQueryOptions(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;
 
@@ -917,18 +1205,18 @@ export type CreatePersonalUnitMutationError = ErrorType<AsError | void>;
 /**
  * @summary Create a new Personal Unit
  */
-export const useCreatePersonalUnit = <
-  TError = ErrorType<AsError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createPersonalUnit>>,
-    TError,
-    { data: PersonalUnitPutBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationResult<
+export const useCreatePersonalUnit = <TError = ErrorType<AsError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof createPersonalUnit>>,
+      TError,
+      { data: PersonalUnitPutBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof createPersonalUnit>>,
   TError,
   { data: PersonalUnitPutBodyBody },
@@ -936,7 +1224,7 @@ export const useCreatePersonalUnit = <
 > => {
   const mutationOptions = getCreatePersonalUnitMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Deletes a Personal Unit. The Unit is *your* Unit, and belongs to the **Default Organisation**
@@ -1012,21 +1300,21 @@ export type DeletePersonalUnitMutationError = ErrorType<void | AsError>;
 /**
  * @summary Deletes a Personal Unit
  */
-export const useDeletePersonalUnit = <
-  TError = ErrorType<void | AsError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deletePersonalUnit>>,
-    TError,
-    void,
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationResult<Awaited<ReturnType<typeof deletePersonalUnit>>, TError, void, TContext> => {
+export const useDeletePersonalUnit = <TError = ErrorType<void | AsError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deletePersonalUnit>>,
+      TError,
+      void,
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<Awaited<ReturnType<typeof deletePersonalUnit>>, TError, void, TContext> => {
   const mutationOptions = getDeletePersonalUnitMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Gets all the Units that you are a member of, or a specific Unit by name.
@@ -1083,7 +1371,7 @@ export const getGetUnitsQueryOptions = <
 >(
   params?: GetUnitsParams,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -1098,12 +1386,61 @@ export const getGetUnitsQueryOptions = <
     Awaited<ReturnType<typeof getUnits>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetUnitsQueryResult = NonNullable<Awaited<ReturnType<typeof getUnits>>>;
 export type GetUnitsQueryError = ErrorType<void | AsError>;
 
+export function useGetUnits<
+  TData = Awaited<ReturnType<typeof getUnits>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params: undefined | GetUnitsParams,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getUnits>>,
+          TError,
+          Awaited<ReturnType<typeof getUnits>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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<
+          Awaited<ReturnType<typeof getUnits>>,
+          TError,
+          Awaited<ReturnType<typeof getUnits>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Units
  */
@@ -1114,13 +1451,16 @@ export function useGetUnits<
 >(
   params?: GetUnitsParams,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetUnitsQueryOptions(params, 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;
 
@@ -1146,7 +1486,7 @@ export const getGetUnitsSuspenseQueryOptions = <
 >(
   params?: GetUnitsParams,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>;
+    query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -1161,12 +1501,45 @@ export const getGetUnitsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUnits>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetUnitsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getUnits>>>;
 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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Units
  */
@@ -1177,15 +1550,17 @@ export function useGetUnitsSuspense<
 >(
   params?: GetUnitsParams,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>;
+    query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetUnitsSuspenseQueryOptions(params, 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;
 
@@ -1281,18 +1656,18 @@ export type CreateDefaultUnitMutationError = ErrorType<AsError | void>;
 /**
  * @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 customFetch>;
-}): UseMutationResult<
+export const useCreateDefaultUnit = <TError = ErrorType<AsError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof createDefaultUnit>>,
+      TError,
+      { data: PersonalUnitPutBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof createDefaultUnit>>,
   TError,
   { data: PersonalUnitPutBodyBody },
@@ -1300,7 +1675,7 @@ export const useCreateDefaultUnit = <
 > => {
   const mutationOptions = getCreateDefaultUnitMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Deletes a Personal Unit. The Unit is *your* Unit, and belongs to the **Default Organisation**
@@ -1376,19 +1751,19 @@ export type DeleteDefaultUnitMutationError = ErrorType<void | AsError>;
 /**
  * @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 customFetch>;
-}): UseMutationResult<Awaited<ReturnType<typeof deleteDefaultUnit>>, TError, void, TContext> => {
+export const useDeleteDefaultUnit = <TError = ErrorType<void | AsError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteDefaultUnit>>,
+      TError,
+      void,
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<Awaited<ReturnType<typeof deleteDefaultUnit>>, TError, void, TContext> => {
   const mutationOptions = getDeleteDefaultUnitMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };