@squonk/account-server-client 4.7.0-trunk.2383504127 → 4.7.2

package/src/api/unit/unit.fetch.ts

@@ -1,11 +1,11 @@
 /**
- * Generated by orval v7.17.0 🍺
+ * Generated by orval v8.22.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
-
-A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
-
+ *
+ * A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
+ *
  * OpenAPI spec version: 4.7
  */
 import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
@@ -38,18 +38,28 @@ import type {
   UnitAllDetail,
   UnitPatchBodyBody,
   UnitsGetResponse,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customFetch } from "../../custom-fetch";
 import type { ErrorType } from "../../custom-fetch";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
-/**
- * Gets Organisational Units you have access to or that are public
+const withQueryKey = <T extends object, K>(query: T, queryKey: K): T & { queryKey: K } => {
+  const result = { queryKey } as T & { queryKey: K };
+  for (const key of Object.keys(query)) {
+    // The explicit queryKey always wins, matching the previous
+    // `{ ...query, queryKey }` spread where it was set last.
+    if (key === "queryKey") continue;
+    Object.defineProperty(result, key, {
+      enumerable: true,
+      configurable: true,
+      get: () => (query as Record<string, unknown>)[key],
+    });
+  }
+  return result;
+};
 
- * @summary Gets Organisational Units
- */
 export type getOrganisationUnitsResponse200 = { data: OrganisationUnitsGetResponse; status: 200 };
 
 export type getOrganisationUnitsResponse401 = { data: void; status: 401 };
@@ -75,6 +85,10 @@ export const getGetOrganisationUnitsUrl = (orgId: string) => {
   return `/organisation/${orgId}/unit`;
 };
 
+/**
+ * Gets Organisational Units you have access to or that are public
+ * @summary Gets Organisational Units
+ */
 export const getOrganisationUnits = async (
   orgId: string,
   options?: RequestInit,
@@ -85,7 +99,7 @@ export const getOrganisationUnits = async (
   });
 };
 
-export const getGetOrganisationUnitsQueryKey = (orgId?: string) => {
+export const getGetOrganisationUnitsQueryKey = (orgId: string) => {
   return ["account-server", "organisation", orgId, "unit"] as const;
 };
 
@@ -108,11 +122,14 @@ export const getGetOrganisationUnitsQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisationUnits>>> = ({ signal }) =>
     getOrganisationUnits(orgId, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!orgId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getOrganisationUnits>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: orgId !== null && orgId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnits>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetOrganisationUnitsQueryResult = NonNullable<
@@ -140,7 +157,7 @@ export function useGetOrganisationUnits<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUnits<
   TData = Awaited<ReturnType<typeof getOrganisationUnits>>,
   TError = ErrorType<void | AsError>,
@@ -161,7 +178,7 @@ export function useGetOrganisationUnits<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUnits<
   TData = Awaited<ReturnType<typeof getOrganisationUnits>>,
   TError = ErrorType<void | AsError>,
@@ -174,7 +191,7 @@ export function useGetOrganisationUnits<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Organisational Units
  */
@@ -191,16 +208,14 @@ export function useGetOrganisationUnits<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationUnitsQueryOptions(orgId, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -242,7 +257,7 @@ export const getGetOrganisationUnitsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationUnits>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetOrganisationUnitsSuspenseQueryResult = NonNullable<
@@ -262,7 +277,7 @@ export function useGetOrganisationUnitsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUnitsSuspense<
   TData = Awaited<ReturnType<typeof getOrganisationUnits>>,
   TError = ErrorType<void | AsError>,
@@ -275,7 +290,7 @@ export function useGetOrganisationUnitsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUnitsSuspense<
   TData = Awaited<ReturnType<typeof getOrganisationUnits>>,
   TError = ErrorType<void | AsError>,
@@ -288,7 +303,7 @@ export function useGetOrganisationUnitsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Organisational Units
  */
@@ -305,28 +320,17 @@ export function useGetOrganisationUnitsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationUnitsSuspenseQueryOptions(orgId, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
-/**
- * Creates a new Organisation Unit.
-
-The **User** who creates the Unit becomes the **Owner** of the Unit. They are considered a *Member* (**User**) of the Unit but are not present in the list of users, which a separate list of users explicitly added to the Unit by a member of the Organisation or another member of the Unit.
-
-You need to be  a member of the **Organisation** or have administration rights to use this endpoint
-
- * @summary Create a new Organisational Unit
- */
 export type createOrganisationUnitResponse201 = { data: OrganisationUnitPostResponse; status: 201 };
 
 export type createOrganisationUnitResponse400 = { data: AsError; status: 400 };
@@ -352,6 +356,14 @@ export const getCreateOrganisationUnitUrl = (orgId: string) => {
   return `/organisation/${orgId}/unit`;
 };
 
+/**
+ * Creates a new Organisation Unit.
+ *
+ * The **User** who creates the Unit becomes the **Owner** of the Unit. They are considered a *Member* (**User**) of the Unit but are not present in the list of users, which a separate list of users explicitly added to the Unit by a member of the Organisation or another member of the Unit.
+ *
+ * You need to be  a member of the **Organisation** or have administration rights to use this endpoint
+ * @summary Create a new Organisational Unit
+ */
 export const createOrganisationUnit = async (
   orgId: string,
   organisationUnitPostBodyBody: OrganisationUnitPostBodyBody,
@@ -427,15 +439,8 @@ export const useCreateOrganisationUnit = <TError = ErrorType<AsError | void>, TC
   { orgId: string; data: OrganisationUnitPostBodyBody },
   TContext
 > => {
-  const mutationOptions = getCreateOrganisationUnitMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getCreateOrganisationUnitMutationOptions(options), 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.
-
- * @summary Gets an Organisational Unit
- */
 export type getUnitResponse200 = { data: UnitAllDetail; status: 200 };
 
 export type getUnitResponse401 = { data: void; status: 401 };
@@ -457,11 +462,15 @@ export const getGetUnitUrl = (unitId: string) => {
   return `/unit/${unitId}`;
 };
 
+/**
+ * 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.
+ * @summary Gets an Organisational Unit
+ */
 export const getUnit = async (unitId: string, options?: RequestInit): Promise<getUnitResponse> => {
   return customFetch<getUnitResponse>(getGetUnitUrl(unitId), { ...options, method: "GET" });
 };
 
-export const getGetUnitQueryKey = (unitId?: string) => {
+export const getGetUnitQueryKey = (unitId: string) => {
   return ["account-server", "unit", unitId] as const;
 };
 
@@ -482,11 +491,14 @@ export const getGetUnitQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getUnit>>> = ({ signal }) =>
     getUnit(unitId, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!unitId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getUnit>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: unitId !== null && unitId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetUnitQueryResult = NonNullable<Awaited<ReturnType<typeof getUnit>>>;
@@ -510,7 +522,7 @@ export function useGetUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnit<
   TData = Awaited<ReturnType<typeof getUnit>>,
   TError = ErrorType<void | AsError>,
@@ -529,7 +541,7 @@ export function useGetUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnit<
   TData = Awaited<ReturnType<typeof getUnit>>,
   TError = ErrorType<void | AsError>,
@@ -540,7 +552,7 @@ export function useGetUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets an Organisational Unit
  */
@@ -555,16 +567,14 @@ export function useGetUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUnitQueryOptions(unitId, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -601,7 +611,7 @@ export const getGetUnitSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUnit>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUnitSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getUnit>>>;
@@ -617,7 +627,7 @@ export function useGetUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnitSuspense<
   TData = Awaited<ReturnType<typeof getUnit>>,
   TError = ErrorType<void | AsError>,
@@ -628,7 +638,7 @@ export function useGetUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnitSuspense<
   TData = Awaited<ReturnType<typeof getUnit>>,
   TError = ErrorType<void | AsError>,
@@ -639,7 +649,7 @@ export function useGetUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets an Organisational Unit
  */
@@ -654,26 +664,17 @@ export function useGetUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUnitSuspenseQueryOptions(unitId, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
-/**
- * Used to update existing Unit. You can change a Unit's **name** or its **default_product_privacy** (as long as the new privacy does not conflict with the Organisation's value).
-
-You have to be a member of the **Unit**, a member of its **Organisation**, or an administrator to patch a Unit.
-
- * @summary Adjust an existing Unit
- */
 export type patchUnitResponse200 = { data: void; status: 200 };
 
 export type patchUnitResponse401 = { data: void; status: 401 };
@@ -695,6 +696,12 @@ export const getPatchUnitUrl = (unitId: string) => {
   return `/unit/${unitId}`;
 };
 
+/**
+ * Used to update existing Unit. You can change a Unit's **name** or its **default_product_privacy** (as long as the new privacy does not conflict with the Organisation's value).
+ *
+ * You have to be a member of the **Unit**, a member of its **Organisation**, or an administrator to patch a Unit.
+ * @summary Adjust an existing Unit
+ */
 export const patchUnit = async (
   unitId: string,
   unitPatchBodyBody: UnitPatchBodyBody,
@@ -768,19 +775,8 @@ export const usePatchUnit = <TError = ErrorType<void | AsError>, TContext = unkn
   { unitId: string; data: UnitPatchBodyBody },
   TContext
 > => {
-  const mutationOptions = getPatchUnitMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getPatchUnitMutationOptions(options), 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.
-
-You cannot delete Units in the **Default Organisation**. These Units are **Personal Units** and need to be deleted using the `DELETE /unit` endpoint.
-
-You cannot delete a Unit that contains undeleted **Products**
-
- * @summary Deletes an Organisational Unit
- */
 export type deleteOrganisationUnitResponse204 = { data: void; status: 204 };
 
 export type deleteOrganisationUnitResponse401 = { data: void; status: 401 };
@@ -806,6 +802,14 @@ export const getDeleteOrganisationUnitUrl = (unitId: string) => {
   return `/unit/${unitId}`;
 };
 
+/**
+ * Deletes an Organisational Unit you have access to. Units can only be deleted by members of the Unit, its Organisation users or admin users.
+ *
+ * You cannot delete Units in the **Default Organisation**. These Units are **Personal Units** and need to be deleted using the `DELETE /unit` endpoint.
+ *
+ * You cannot delete a Unit that contains undeleted **Products**
+ * @summary Deletes an Organisational Unit
+ */
 export const deleteOrganisationUnit = async (
   unitId: string,
   options?: RequestInit,
@@ -878,13 +882,8 @@ export const useDeleteOrganisationUnit = <TError = ErrorType<void | AsError>, TC
   { unitId: string },
   TContext
 > => {
-  const mutationOptions = getDeleteOrganisationUnitMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getDeleteOrganisationUnitMutationOptions(options), queryClient);
 };
-/**
- * @summary Gets your Personal Unit (if you have one)
- */
 export type getPersonalUnitResponse200 = { data: UnitAllDetail; status: 200 };
 
 export type getPersonalUnitResponse401 = { data: void; status: 401 };
@@ -906,6 +905,9 @@ export const getGetPersonalUnitUrl = () => {
   return `/personal-unit`;
 };
 
+/**
+ * @summary Gets your Personal Unit (if you have one)
+ */
 export const getPersonalUnit = async (options?: RequestInit): Promise<getPersonalUnitResponse> => {
   return customFetch<getPersonalUnitResponse>(getGetPersonalUnitUrl(), {
     ...options,
@@ -935,7 +937,7 @@ export const getGetPersonalUnitQueryOptions = <
     Awaited<ReturnType<typeof getPersonalUnit>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetPersonalUnitQueryResult = NonNullable<Awaited<ReturnType<typeof getPersonalUnit>>>;
@@ -958,7 +960,7 @@ export function useGetPersonalUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetPersonalUnit<
   TData = Awaited<ReturnType<typeof getPersonalUnit>>,
   TError = ErrorType<void | AsError>,
@@ -976,7 +978,7 @@ export function useGetPersonalUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetPersonalUnit<
   TData = Awaited<ReturnType<typeof getPersonalUnit>>,
   TError = ErrorType<void | AsError>,
@@ -986,7 +988,7 @@ export function useGetPersonalUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets your Personal Unit (if you have one)
  */
@@ -1000,16 +1002,14 @@ export function useGetPersonalUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetPersonalUnitQueryOptions(options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1044,7 +1044,7 @@ export const getGetPersonalUnitSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getPersonalUnit>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetPersonalUnitSuspenseQueryResult = NonNullable<
@@ -1063,7 +1063,7 @@ export function useGetPersonalUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetPersonalUnitSuspense<
   TData = Awaited<ReturnType<typeof getPersonalUnit>>,
   TError = ErrorType<void | AsError>,
@@ -1075,7 +1075,7 @@ export function useGetPersonalUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetPersonalUnitSuspense<
   TData = Awaited<ReturnType<typeof getPersonalUnit>>,
   TError = ErrorType<void | AsError>,
@@ -1087,7 +1087,7 @@ export function useGetPersonalUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets your Personal Unit (if you have one)
  */
@@ -1103,26 +1103,17 @@ export function useGetPersonalUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetPersonalUnitSuspenseQueryOptions(options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
-/**
- * Creates a Personal Unit for a User. The unit will belong to the built-in **Default Organisation**.
-
-Users can only create one Personal unit and you cannot add other Users to a Personal Unit.
-
- * @summary Create a new Personal Unit
- */
 export type createPersonalUnitResponse201 = { data: PersonalUnitPutResponse; status: 201 };
 
 export type createPersonalUnitResponse400 = { data: AsError; status: 400 };
@@ -1148,6 +1139,12 @@ export const getCreatePersonalUnitUrl = () => {
   return `/personal-unit`;
 };
 
+/**
+ * Creates a Personal Unit for a User. The unit will belong to the built-in **Default Organisation**.
+ *
+ * Users can only create one Personal unit and you cannot add other Users to a Personal Unit.
+ * @summary Create a new Personal Unit
+ */
 export const createPersonalUnit = async (
   personalUnitPutBodyBody: PersonalUnitPutBodyBody,
   options?: RequestInit,
@@ -1222,15 +1219,8 @@ export const useCreatePersonalUnit = <TError = ErrorType<AsError | void>, TConte
   { data: PersonalUnitPutBodyBody },
   TContext
 > => {
-  const mutationOptions = getCreatePersonalUnitMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getCreatePersonalUnitMutationOptions(options), queryClient);
 };
-/**
- * Deletes a Personal Unit. The Unit is *your* Unit, and belongs to the **Default Organisation**
-
- * @summary Deletes a Personal Unit
- */
 export type deletePersonalUnitResponse204 = { data: void; status: 204 };
 
 export type deletePersonalUnitResponse401 = { data: void; status: 401 };
@@ -1256,6 +1246,10 @@ export const getDeletePersonalUnitUrl = () => {
   return `/personal-unit`;
 };
 
+/**
+ * Deletes a Personal Unit. The Unit is *your* Unit, and belongs to the **Default Organisation**
+ * @summary Deletes a Personal Unit
+ */
 export const deletePersonalUnit = async (
   options?: RequestInit,
 ): Promise<deletePersonalUnitResponse> => {
@@ -1312,17 +1306,8 @@ export const useDeletePersonalUnit = <TError = ErrorType<void | AsError>, TConte
   },
   queryClient?: QueryClient,
 ): UseMutationResult<Awaited<ReturnType<typeof deletePersonalUnit>>, TError, void, TContext> => {
-  const mutationOptions = getDeletePersonalUnitMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getDeletePersonalUnitMutationOptions(options), queryClient);
 };
-/**
- * Gets all the Units that you are a member of, or a specific Unit by name.
-
-You can see a Unit if you are a member of it, the owner (creator) of it, or a member or creator of the Unit's Organisation, or if you are an admin user.
-
- * @summary Gets Units
- */
 export type getUnitsResponse200 = { data: UnitsGetResponse; status: 200 };
 
 export type getUnitsResponse401 = { data: void; status: 401 };
@@ -1345,7 +1330,7 @@ export const getGetUnitsUrl = (params?: GetUnitsParams) => {
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -1354,6 +1339,12 @@ export const getGetUnitsUrl = (params?: GetUnitsParams) => {
   return stringifiedParams.length > 0 ? `/unit?${stringifiedParams}` : `/unit`;
 };
 
+/**
+ * Gets all the Units that you are a member of, or a specific Unit by name.
+ *
+ * You can see a Unit if you are a member of it, the owner (creator) of it, or a member or creator of the Unit's Organisation, or if you are an admin user.
+ * @summary Gets Units
+ */
 export const getUnits = async (
   params?: GetUnitsParams,
   options?: RequestInit,
@@ -1386,7 +1377,7 @@ export const getGetUnitsQueryOptions = <
     Awaited<ReturnType<typeof getUnits>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUnitsQueryResult = NonNullable<Awaited<ReturnType<typeof getUnits>>>;
@@ -1410,7 +1401,7 @@ export function useGetUnits<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnits<
   TData = Awaited<ReturnType<typeof getUnits>>,
   TError = ErrorType<void | AsError>,
@@ -1429,7 +1420,7 @@ export function useGetUnits<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnits<
   TData = Awaited<ReturnType<typeof getUnits>>,
   TError = ErrorType<void | AsError>,
@@ -1440,7 +1431,7 @@ export function useGetUnits<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Units
  */
@@ -1455,16 +1446,14 @@ export function useGetUnits<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUnitsQueryOptions(params, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1501,7 +1490,7 @@ export const getGetUnitsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUnits>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUnitsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getUnits>>>;
@@ -1517,7 +1506,7 @@ export function useGetUnitsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnitsSuspense<
   TData = Awaited<ReturnType<typeof getUnits>>,
   TError = ErrorType<void | AsError>,
@@ -1528,7 +1517,7 @@ export function useGetUnitsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUnitsSuspense<
   TData = Awaited<ReturnType<typeof getUnits>>,
   TError = ErrorType<void | AsError>,
@@ -1539,7 +1528,7 @@ export function useGetUnitsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Units
  */
@@ -1554,28 +1543,17 @@ export function useGetUnitsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUnitsSuspenseQueryOptions(params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
-/**
- * Creates a Personal Unit for a User. The unit will belong to the built-in **Default Organisation**.
-
-Users can only create one Personal unit and you cannot add other Users to a Personal Unit.
-
-This endpoint is DECREMENTED and will be removed in a future release. Please use **PUT** at `/personal-unit`.
-
- * @summary Create a new Personal Unit
- */
 export type createDefaultUnitResponse201 = { data: PersonalUnitPutResponse; status: 201 };
 
 export type createDefaultUnitResponse400 = { data: AsError; status: 400 };
@@ -1599,6 +1577,14 @@ export const getCreateDefaultUnitUrl = () => {
   return `/unit`;
 };
 
+/**
+ * Creates a Personal Unit for a User. The unit will belong to the built-in **Default Organisation**.
+ *
+ * Users can only create one Personal unit and you cannot add other Users to a Personal Unit.
+ *
+ * This endpoint is DECREMENTED and will be removed in a future release. Please use **PUT** at `/personal-unit`.
+ * @summary Create a new Personal Unit
+ */
 export const createDefaultUnit = async (
   personalUnitPutBodyBody: PersonalUnitPutBodyBody,
   options?: RequestInit,
@@ -1673,17 +1659,8 @@ export const useCreateDefaultUnit = <TError = ErrorType<AsError | void>, TContex
   { data: PersonalUnitPutBodyBody },
   TContext
 > => {
-  const mutationOptions = getCreateDefaultUnitMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getCreateDefaultUnitMutationOptions(options), queryClient);
 };
-/**
- * Deletes a Personal Unit. The Unit is *your* Unit, and belongs to the **Default Organisation**
-
-This endpoint is DECREMENTED and will be removed in a future release. Please use **DELETE** at `/personal-unit`.
-
- * @summary Deletes a Personal Unit
- */
 export type deleteDefaultUnitResponse204 = { data: void; status: 204 };
 
 export type deleteDefaultUnitResponse401 = { data: void; status: 401 };
@@ -1707,6 +1684,12 @@ export const getDeleteDefaultUnitUrl = () => {
   return `/unit`;
 };
 
+/**
+ * Deletes a Personal Unit. The Unit is *your* Unit, and belongs to the **Default Organisation**
+ *
+ * This endpoint is DECREMENTED and will be removed in a future release. Please use **DELETE** at `/personal-unit`.
+ * @summary Deletes a Personal Unit
+ */
 export const deleteDefaultUnit = async (
   options?: RequestInit,
 ): Promise<deleteDefaultUnitResponse> => {
@@ -1763,7 +1746,5 @@ export const useDeleteDefaultUnit = <TError = ErrorType<void | AsError>, TContex
   },
   queryClient?: QueryClient,
 ): UseMutationResult<Awaited<ReturnType<typeof deleteDefaultUnit>>, TError, void, TContext> => {
-  const mutationOptions = getDeleteDefaultUnitMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getDeleteDefaultUnitMutationOptions(options), queryClient);
 };