@squonk/account-server-client 4.6.0-trunk.2355119483 → 4.7.2

package/src/api/unit/unit.ts

@@ -1,12 +1,12 @@
 /**
- * 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**.
-
- * OpenAPI spec version: 4.6
+ *
+ * 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";
 import type {
@@ -38,16 +38,30 @@ import type {
   UnitAllDetail,
   UnitPatchBodyBody,
   UnitsGetResponse,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customInstance } from "../../custom-axios";
 import type { ErrorType } from "../../custom-axios";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+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;
+};
+
 /**
  * Gets Organisational Units you have access to or that are public
-
  * @summary Gets Organisational Units
  */
 export const getOrganisationUnits = (
@@ -61,7 +75,7 @@ export const getOrganisationUnits = (
   );
 };
 
-export const getGetOrganisationUnitsQueryKey = (orgId?: string) => {
+export const getGetOrganisationUnitsQueryKey = (orgId: string) => {
   return ["account-server", "organisation", orgId, "unit"] as const;
 };
 
@@ -84,11 +98,14 @@ export const getGetOrganisationUnitsQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisationUnits>>> = ({ signal }) =>
     getOrganisationUnits(orgId, requestOptions, signal);
 
-  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<
@@ -116,7 +133,7 @@ export function useGetOrganisationUnits<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -137,7 +154,7 @@ export function useGetOrganisationUnits<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -150,7 +167,7 @@ export function useGetOrganisationUnits<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Organisational Units
  */
@@ -167,16 +184,14 @@ export function useGetOrganisationUnits<
     request?: SecondParameter<typeof customInstance>;
   },
   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);
 }
 
 /**
@@ -218,7 +233,7 @@ export const getGetOrganisationUnitsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationUnits>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetOrganisationUnitsSuspenseQueryResult = NonNullable<
@@ -238,7 +253,7 @@ export function useGetOrganisationUnitsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -251,7 +266,7 @@ export function useGetOrganisationUnitsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -264,7 +279,7 @@ export function useGetOrganisationUnitsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Organisational Units
  */
@@ -281,26 +296,23 @@ export function useGetOrganisationUnitsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  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
-
+ *
+ * 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 = (
@@ -383,13 +395,10 @@ 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 const getUnit = (
@@ -400,7 +409,7 @@ export const getUnit = (
   return customInstance<UnitAllDetail>({ url: `/unit/${unitId}`, method: "GET", signal }, options);
 };
 
-export const getGetUnitQueryKey = (unitId?: string) => {
+export const getGetUnitQueryKey = (unitId: string) => {
   return ["account-server", "unit", unitId] as const;
 };
 
@@ -421,11 +430,14 @@ export const getGetUnitQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getUnit>>> = ({ signal }) =>
     getUnit(unitId, requestOptions, signal);
 
-  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>>>;
@@ -449,7 +461,7 @@ export function useGetUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -468,7 +480,7 @@ export function useGetUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -479,7 +491,7 @@ export function useGetUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets an Organisational Unit
  */
@@ -494,16 +506,14 @@ export function useGetUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   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);
 }
 
 /**
@@ -540,7 +550,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>>>;
@@ -556,7 +566,7 @@ export function useGetUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -567,7 +577,7 @@ export function useGetUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -578,7 +588,7 @@ export function useGetUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets an Organisational Unit
  */
@@ -593,30 +603,28 @@ export function useGetUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  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.
-
+ *
+ * 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 = (
   unitId: string,
   unitPatchBodyBody: UnitPatchBodyBody,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
     {
@@ -624,6 +632,7 @@ export const patchUnit = (
       method: "PATCH",
       headers: { "Content-Type": "application/json" },
       data: unitPatchBodyBody,
+      signal,
     },
     options,
   );
@@ -689,24 +698,22 @@ 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**
-
+ *
+ * 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 = (
   unitId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<void>({ url: `/unit/${unitId}`, method: "DELETE" }, options);
+  return customInstance<void>({ url: `/unit/${unitId}`, method: "DELETE", signal }, options);
 };
 
 export const getDeleteOrganisationUnitMutationOptions = <
@@ -771,9 +778,7 @@ 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)
@@ -807,7 +812,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>>>;
@@ -830,7 +835,7 @@ export function useGetPersonalUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -848,7 +853,7 @@ export function useGetPersonalUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -858,7 +863,7 @@ export function useGetPersonalUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   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)
  */
@@ -872,16 +877,14 @@ export function useGetPersonalUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   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);
 }
 
 /**
@@ -916,7 +919,7 @@ export const getGetPersonalUnitSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getPersonalUnit>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetPersonalUnitSuspenseQueryResult = NonNullable<
@@ -935,7 +938,7 @@ export function useGetPersonalUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -947,7 +950,7 @@ export function useGetPersonalUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -959,7 +962,7 @@ export function useGetPersonalUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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)
  */
@@ -975,29 +978,27 @@ export function useGetPersonalUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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.
-
+ *
+ * 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 = (
   personalUnitPutBodyBody: PersonalUnitPutBodyBody,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<PersonalUnitPutResponse>(
     {
@@ -1005,6 +1006,7 @@ export const createPersonalUnit = (
       method: "PUT",
       headers: { "Content-Type": "application/json" },
       data: personalUnitPutBodyBody,
+      signal,
     },
     options,
   );
@@ -1072,17 +1074,17 @@ 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 const deletePersonalUnit = (options?: SecondParameter<typeof customInstance>) => {
-  return customInstance<void>({ url: `/personal-unit`, method: "DELETE" }, options);
+export const deletePersonalUnit = (
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
+) => {
+  return customInstance<void>({ url: `/personal-unit`, method: "DELETE", signal }, options);
 };
 
 export const getDeletePersonalUnitMutationOptions = <
@@ -1132,15 +1134,12 @@ 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.
-
+ *
+ * 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 = (
@@ -1176,7 +1175,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>>>;
@@ -1200,7 +1199,7 @@ export function useGetUnits<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1219,7 +1218,7 @@ export function useGetUnits<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1230,7 +1229,7 @@ export function useGetUnits<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Units
  */
@@ -1245,16 +1244,14 @@ export function useGetUnits<
     request?: SecondParameter<typeof customInstance>;
   },
   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);
 }
 
 /**
@@ -1291,7 +1288,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>>>;
@@ -1307,7 +1304,7 @@ export function useGetUnitsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1318,7 +1315,7 @@ export function useGetUnitsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1329,7 +1326,7 @@ export function useGetUnitsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Units
  */
@@ -1344,31 +1341,29 @@ export function useGetUnitsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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`.
-
+ *
+ * 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 = (
   personalUnitPutBodyBody: PersonalUnitPutBodyBody,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<PersonalUnitPutResponse>(
     {
@@ -1376,6 +1371,7 @@ export const createDefaultUnit = (
       method: "PUT",
       headers: { "Content-Type": "application/json" },
       data: personalUnitPutBodyBody,
+      signal,
     },
     options,
   );
@@ -1443,19 +1439,19 @@ 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`.
-
+ *
+ * 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 = (options?: SecondParameter<typeof customInstance>) => {
-  return customInstance<void>({ url: `/unit`, method: "DELETE" }, options);
+export const deleteDefaultUnit = (
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
+) => {
+  return customInstance<void>({ url: `/unit`, method: "DELETE", signal }, options);
 };
 
 export const getDeleteDefaultUnitMutationOptions = <
@@ -1505,7 +1501,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);
 };