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

package/src/api/organisation/organisation.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";
@@ -36,20 +36,28 @@ import type {
   OrganisationPostBodyBody,
   OrganisationPostResponse,
   OrganisationsGetResponse,
-} 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 all the Organisations that you are a member of, or a specific Organisation by name.
-
-You can see an Organisation if you are a member of it, the owner (creator) of it, or if you are an admin user.
+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 Organisations
- */
 export type getOrganisationsResponse200 = { data: OrganisationsGetResponse; status: 200 };
 
 export type getOrganisationsResponse401 = { data: void; status: 401 };
@@ -74,7 +82,7 @@ export const getGetOrganisationsUrl = (params?: GetOrganisationsParams) => {
 
   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));
     }
   });
 
@@ -83,6 +91,12 @@ export const getGetOrganisationsUrl = (params?: GetOrganisationsParams) => {
   return stringifiedParams.length > 0 ? `/organisation?${stringifiedParams}` : `/organisation`;
 };
 
+/**
+ * Gets all the Organisations that you are a member of, or a specific Organisation by name.
+ *
+ * You can see an Organisation if you are a member of it, the owner (creator) of it, or if you are an admin user.
+ * @summary Gets Organisations
+ */
 export const getOrganisations = async (
   params?: GetOrganisationsParams,
   options?: RequestInit,
@@ -118,7 +132,7 @@ export const getGetOrganisationsQueryOptions = <
     Awaited<ReturnType<typeof getOrganisations>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetOrganisationsQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisations>>>;
@@ -142,7 +156,7 @@ export function useGetOrganisations<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisations<
   TData = Awaited<ReturnType<typeof getOrganisations>>,
   TError = ErrorType<void | AsError>,
@@ -161,7 +175,7 @@ export function useGetOrganisations<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisations<
   TData = Awaited<ReturnType<typeof getOrganisations>>,
   TError = ErrorType<void | AsError>,
@@ -172,7 +186,7 @@ export function useGetOrganisations<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Organisations
  */
@@ -187,16 +201,14 @@ export function useGetOrganisations<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationsQueryOptions(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);
 }
 
 /**
@@ -235,7 +247,7 @@ export const getGetOrganisationsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisations>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetOrganisationsSuspenseQueryResult = NonNullable<
@@ -255,7 +267,7 @@ export function useGetOrganisationsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationsSuspense<
   TData = Awaited<ReturnType<typeof getOrganisations>>,
   TError = ErrorType<void | AsError>,
@@ -268,7 +280,7 @@ export function useGetOrganisationsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationsSuspense<
   TData = Awaited<ReturnType<typeof getOrganisations>>,
   TError = ErrorType<void | AsError>,
@@ -281,7 +293,7 @@ export function useGetOrganisationsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Organisations
  */
@@ -298,28 +310,17 @@ export function useGetOrganisationsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationsSuspenseQueryOptions(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 new Organisation.
-
-The **User** who creates the Organisation becomes the **Owner** of the Organisation. They are considered a *Member* (**User**) of the Organisation but are not present in the list of users, which a separate list of users explicitly added to the Organisation by the Owner or another Organisation User.
-
-You need admin rights to use this method
-
- * @summary Create a new organisation
- */
 export type createOrganisationResponse201 = { data: OrganisationPostResponse; status: 201 };
 
 export type createOrganisationResponse400 = { data: AsError; status: 400 };
@@ -345,6 +346,14 @@ export const getCreateOrganisationUrl = () => {
   return `/organisation`;
 };
 
+/**
+ * Creates a new Organisation.
+ *
+ * The **User** who creates the Organisation becomes the **Owner** of the Organisation. They are considered a *Member* (**User**) of the Organisation but are not present in the list of users, which a separate list of users explicitly added to the Organisation by the Owner or another Organisation User.
+ *
+ * You need admin rights to use this method
+ * @summary Create a new organisation
+ */
 export const createOrganisation = async (
   organisationPostBodyBody: OrganisationPostBodyBody,
   options?: RequestInit,
@@ -419,17 +428,8 @@ export const useCreateOrganisation = <TError = ErrorType<AsError | void>, TConte
   { data: OrganisationPostBodyBody },
   TContext
 > => {
-  const mutationOptions = getCreateOrganisationMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getCreateOrganisationMutationOptions(options), queryClient);
 };
-/**
- * Gets an Organisation. To see the Organisation you need admin rights or need to be a member of the Organisation or are its *creator*.
-
-Members of an Organisation's **Unit** do not have access to the Organisation.
-
- * @summary Gets an Organisation
- */
 export type getOrganisationResponse200 = { data: OrganisationAllDetail; status: 200 };
 
 export type getOrganisationResponse401 = { data: void; status: 401 };
@@ -451,6 +451,12 @@ export const getGetOrganisationUrl = (orgId: string) => {
   return `/organisation/${orgId}`;
 };
 
+/**
+ * Gets an Organisation. To see the Organisation you need admin rights or need to be a member of the Organisation or are its *creator*.
+ *
+ * Members of an Organisation's **Unit** do not have access to the Organisation.
+ * @summary Gets an Organisation
+ */
 export const getOrganisation = async (
   orgId: string,
   options?: RequestInit,
@@ -461,7 +467,7 @@ export const getOrganisation = async (
   });
 };
 
-export const getGetOrganisationQueryKey = (orgId?: string) => {
+export const getGetOrganisationQueryKey = (orgId: string) => {
   return ["account-server", "organisation", orgId] as const;
 };
 
@@ -482,11 +488,14 @@ export const getGetOrganisationQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisation>>> = ({ signal }) =>
     getOrganisation(orgId, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!orgId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getOrganisation>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: orgId !== null && orgId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetOrganisationQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisation>>>;
@@ -510,7 +519,7 @@ export function useGetOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisation<
   TData = Awaited<ReturnType<typeof getOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -529,7 +538,7 @@ export function useGetOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisation<
   TData = Awaited<ReturnType<typeof getOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -540,7 +549,7 @@ export function useGetOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets an Organisation
  */
@@ -555,16 +564,14 @@ export function useGetOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationQueryOptions(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);
 }
 
 /**
@@ -603,7 +610,7 @@ export const getGetOrganisationSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisation>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetOrganisationSuspenseQueryResult = NonNullable<
@@ -623,7 +630,7 @@ export function useGetOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationSuspense<
   TData = Awaited<ReturnType<typeof getOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -636,7 +643,7 @@ export function useGetOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationSuspense<
   TData = Awaited<ReturnType<typeof getOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -649,7 +656,7 @@ export function useGetOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets an Organisation
  */
@@ -666,28 +673,17 @@ export function useGetOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationSuspenseQueryOptions(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);
 }
 
-/**
- * Used to update existing Organisation. You can change an Organisation's **name** or its **default_product_privacy**.
-
-Changes to the default product privacy may conflict with those settings in any existing Units where the default product privacy of those existing units will be honoured. Any new Organisation value will only apply to new Units.
-
-You have to be a member of the **Organisation**, its creator, or an administrator to patch an Organisation.
-
- * @summary Adjust an existing Organisation
- */
 export type patchOrganisationResponse200 = { data: void; status: 200 };
 
 export type patchOrganisationResponse401 = { data: void; status: 401 };
@@ -711,6 +707,14 @@ export const getPatchOrganisationUrl = (orgId: string) => {
   return `/organisation/${orgId}`;
 };
 
+/**
+ * Used to update existing Organisation. You can change an Organisation's **name** or its **default_product_privacy**.
+ *
+ * Changes to the default product privacy may conflict with those settings in any existing Units where the default product privacy of those existing units will be honoured. Any new Organisation value will only apply to new Units.
+ *
+ * You have to be a member of the **Organisation**, its creator, or an administrator to patch an Organisation.
+ * @summary Adjust an existing Organisation
+ */
 export const patchOrganisation = async (
   orgId: string,
   organisationPatchBodyBody: OrganisationPatchBodyBody,
@@ -786,17 +790,8 @@ export const usePatchOrganisation = <TError = ErrorType<void | AsError>, TContex
   { orgId: string; data: OrganisationPatchBodyBody },
   TContext
 > => {
-  const mutationOptions = getPatchOrganisationMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getPatchOrganisationMutationOptions(options), queryClient);
 };
-/**
- * Before an Organisation can be deleted all its underlying **Units** must also be deleted, remembering that **Units** that have undeleted **Products** cannot be deleted.
-
-You need admin rights to use this method
-
- * @summary Deletes an Organisation
- */
 export type deleteOrganisationResponse204 = { data: void; status: 204 };
 
 export type deleteOrganisationResponse400 = { data: AsError; status: 400 };
@@ -822,6 +817,12 @@ export const getDeleteOrganisationUrl = (orgId: string) => {
   return `/organisation/${orgId}`;
 };
 
+/**
+ * Before an Organisation can be deleted all its underlying **Units** must also be deleted, remembering that **Units** that have undeleted **Products** cannot be deleted.
+ *
+ * You need admin rights to use this method
+ * @summary Deletes an Organisation
+ */
 export const deleteOrganisation = async (
   orgId: string,
   options?: RequestInit,
@@ -894,17 +895,8 @@ export const useDeleteOrganisation = <TError = ErrorType<AsError | void>, TConte
   { orgId: string },
   TContext
 > => {
-  const mutationOptions = getDeleteOrganisationMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getDeleteOrganisationMutationOptions(options), queryClient);
 };
-/**
- * Gets the Default Organisation, a built-in Organisation used exclusively for **Personal Units**.
-
-Any authorised user can see the Default Organisation.
-
- * @summary Gets the Default Organisation
- */
 export type getDefaultOrganisationResponse200 = {
   data: OrganisationGetDefaultResponse;
   status: 200;
@@ -933,6 +925,12 @@ export const getGetDefaultOrganisationUrl = () => {
   return `/default/organisation`;
 };
 
+/**
+ * Gets the Default Organisation, a built-in Organisation used exclusively for **Personal Units**.
+ *
+ * Any authorised user can see the Default Organisation.
+ * @summary Gets the Default Organisation
+ */
 export const getDefaultOrganisation = async (
   options?: RequestInit,
 ): Promise<getDefaultOrganisationResponse> => {
@@ -966,7 +964,7 @@ export const getGetDefaultOrganisationQueryOptions = <
     Awaited<ReturnType<typeof getDefaultOrganisation>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetDefaultOrganisationQueryResult = NonNullable<
@@ -993,7 +991,7 @@ export function useGetDefaultOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetDefaultOrganisation<
   TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -1013,7 +1011,7 @@ export function useGetDefaultOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetDefaultOrganisation<
   TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -1025,7 +1023,7 @@ export function useGetDefaultOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the Default Organisation
  */
@@ -1041,16 +1039,14 @@ export function useGetDefaultOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetDefaultOrganisationQueryOptions(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);
 }
 
 /**
@@ -1085,7 +1081,7 @@ export const getGetDefaultOrganisationSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getDefaultOrganisation>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetDefaultOrganisationSuspenseQueryResult = NonNullable<
@@ -1104,7 +1100,7 @@ export function useGetDefaultOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetDefaultOrganisationSuspense<
   TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -1116,7 +1112,7 @@ export function useGetDefaultOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetDefaultOrganisationSuspense<
   TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -1128,7 +1124,7 @@ export function useGetDefaultOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the Default Organisation
  */
@@ -1144,15 +1140,13 @@ export function useGetDefaultOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetDefaultOrganisationSuspenseQueryOptions(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);
 }