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

package/src/api/organisation/organisation.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,
@@ -99,7 +103,7 @@ export const getGetOrganisationsQueryOptions = <
 >(
   params?: GetOrganisationsParams,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -114,12 +118,61 @@ export const getGetOrganisationsQueryOptions = <
     Awaited<ReturnType<typeof getOrganisations>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetOrganisationsQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisations>>>;
 export type GetOrganisationsQueryError = ErrorType<void | AsError>;
 
+export function useGetOrganisations<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params: undefined | GetOrganisationsParams,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getOrganisations>>,
+          TError,
+          Awaited<ReturnType<typeof getOrganisations>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisations<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getOrganisations>>,
+          TError,
+          Awaited<ReturnType<typeof getOrganisations>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisations<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Organisations
  */
@@ -130,13 +183,16 @@ export function useGetOrganisations<
 >(
   params?: GetOrganisationsParams,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetOrganisationsQueryOptions(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;
 
@@ -162,7 +218,9 @@ export const getGetOrganisationsSuspenseQueryOptions = <
 >(
   params?: GetOrganisationsParams,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>;
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -177,7 +235,7 @@ export const getGetOrganisationsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisations>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetOrganisationsSuspenseQueryResult = NonNullable<
@@ -185,6 +243,45 @@ export type GetOrganisationsSuspenseQueryResult = NonNullable<
 >;
 export type GetOrganisationsSuspenseQueryError = ErrorType<void | AsError>;
 
+export function useGetOrganisationsSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params: undefined | GetOrganisationsParams,
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationsSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationsSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Organisations
  */
@@ -195,15 +292,19 @@ export function useGetOrganisationsSuspense<
 >(
   params?: GetOrganisationsParams,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>;
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetOrganisationsSuspenseQueryOptions(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;
 
@@ -301,18 +402,18 @@ export type CreateOrganisationMutationError = ErrorType<AsError | void>;
 /**
  * @summary Create a new organisation
  */
-export const useCreateOrganisation = <
-  TError = ErrorType<AsError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createOrganisation>>,
-    TError,
-    { data: OrganisationPostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationResult<
+export const useCreateOrganisation = <TError = ErrorType<AsError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof createOrganisation>>,
+      TError,
+      { data: OrganisationPostBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof createOrganisation>>,
   TError,
   { data: OrganisationPostBodyBody },
@@ -320,7 +421,7 @@ export const useCreateOrganisation = <
 > => {
   const mutationOptions = getCreateOrganisationMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, 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*.
@@ -370,7 +471,7 @@ export const getGetOrganisationQueryOptions = <
 >(
   orgId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -385,12 +486,61 @@ export const getGetOrganisationQueryOptions = <
     Awaited<ReturnType<typeof getOrganisation>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetOrganisationQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisation>>>;
 export type GetOrganisationQueryError = ErrorType<void | AsError>;
 
+export function useGetOrganisation<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getOrganisation>>,
+          TError,
+          Awaited<ReturnType<typeof getOrganisation>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisation<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getOrganisation>>,
+          TError,
+          Awaited<ReturnType<typeof getOrganisation>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisation<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets an Organisation
  */
@@ -401,13 +551,16 @@ export function useGetOrganisation<
 >(
   orgId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetOrganisationQueryOptions(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;
 
@@ -433,7 +586,9 @@ export const getGetOrganisationSuspenseQueryOptions = <
 >(
   orgId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>;
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
 ) => {
@@ -448,7 +603,7 @@ export const getGetOrganisationSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisation>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetOrganisationSuspenseQueryResult = NonNullable<
@@ -456,6 +611,45 @@ export type GetOrganisationSuspenseQueryResult = NonNullable<
 >;
 export type GetOrganisationSuspenseQueryError = ErrorType<void | AsError>;
 
+export function useGetOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets an Organisation
  */
@@ -466,15 +660,19 @@ export function useGetOrganisationSuspense<
 >(
   orgId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>;
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
-): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetOrganisationSuspenseQueryOptions(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;
 
@@ -571,18 +769,18 @@ export type PatchOrganisationMutationError = ErrorType<void | AsError>;
 /**
  * @summary Adjust an existing Organisation
  */
-export const usePatchOrganisation = <
-  TError = ErrorType<void | AsError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof patchOrganisation>>,
-    TError,
-    { orgId: string; data: OrganisationPatchBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationResult<
+export const usePatchOrganisation = <TError = ErrorType<void | AsError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof patchOrganisation>>,
+      TError,
+      { orgId: string; data: OrganisationPatchBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof patchOrganisation>>,
   TError,
   { orgId: string; data: OrganisationPatchBodyBody },
@@ -590,7 +788,7 @@ export const usePatchOrganisation = <
 > => {
   const mutationOptions = getPatchOrganisationMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, 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.
@@ -679,18 +877,18 @@ export type DeleteOrganisationMutationError = ErrorType<AsError | void>;
 /**
  * @summary Deletes an Organisation
  */
-export const useDeleteOrganisation = <
-  TError = ErrorType<AsError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteOrganisation>>,
-    TError,
-    { orgId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationResult<
+export const useDeleteOrganisation = <TError = ErrorType<AsError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteOrganisation>>,
+      TError,
+      { orgId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof deleteOrganisation>>,
   TError,
   { orgId: string },
@@ -698,7 +896,7 @@ export const useDeleteOrganisation = <
 > => {
   const mutationOptions = getDeleteOrganisationMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Gets the Default Organisation, a built-in Organisation used exclusively for **Personal Units**.
@@ -752,7 +950,9 @@ export const getGetDefaultOrganisationQueryOptions = <
   TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
   TError = ErrorType<void | AsError>,
 >(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>;
+  query?: Partial<
+    UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+  >;
   request?: SecondParameter<typeof customFetch>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -766,7 +966,7 @@ export const getGetDefaultOrganisationQueryOptions = <
     Awaited<ReturnType<typeof getDefaultOrganisation>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetDefaultOrganisationQueryResult = NonNullable<
@@ -774,6 +974,58 @@ export type GetDefaultOrganisationQueryResult = NonNullable<
 >;
 export type GetDefaultOrganisationQueryError = ErrorType<void | AsError>;
 
+export function useGetDefaultOrganisation<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getDefaultOrganisation>>,
+          TError,
+          Awaited<ReturnType<typeof getDefaultOrganisation>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetDefaultOrganisation<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getDefaultOrganisation>>,
+          TError,
+          Awaited<ReturnType<typeof getDefaultOrganisation>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetDefaultOrganisation<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets the Default Organisation
  */
@@ -781,13 +1033,20 @@ export type GetDefaultOrganisationQueryError = ErrorType<void | AsError>;
 export function useGetDefaultOrganisation<
   TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
   TError = ErrorType<void | AsError>,
->(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>;
-  request?: SecondParameter<typeof customFetch>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetDefaultOrganisationQueryOptions(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;
 
@@ -810,10 +1069,8 @@ export const getGetDefaultOrganisationSuspenseQueryOptions = <
   TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
   TError = ErrorType<void | AsError>,
 >(options?: {
-  query?: UseSuspenseQueryOptions<
-    Awaited<ReturnType<typeof getDefaultOrganisation>>,
-    TError,
-    TData
+  query?: Partial<
+    UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
   >;
   request?: SecondParameter<typeof customFetch>;
 }) => {
@@ -828,7 +1085,7 @@ export const getGetDefaultOrganisationSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getDefaultOrganisation>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetDefaultOrganisationSuspenseQueryResult = NonNullable<
@@ -836,6 +1093,42 @@ export type GetDefaultOrganisationSuspenseQueryResult = NonNullable<
 >;
 export type GetDefaultOrganisationSuspenseQueryError = ErrorType<void | AsError>;
 
+export function useGetDefaultOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetDefaultOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export function useGetDefaultOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets the Default Organisation
  */
@@ -843,19 +1136,21 @@ export type GetDefaultOrganisationSuspenseQueryError = ErrorType<void | AsError>
 export function useGetDefaultOrganisationSuspense<
   TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
   TError = ErrorType<void | AsError>,
->(options?: {
-  query?: UseSuspenseQueryOptions<
-    Awaited<ReturnType<typeof getDefaultOrganisation>>,
-    TError,
-    TData
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetDefaultOrganisationSuspenseQueryOptions(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;