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

package/src/api/product/product.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,18 +36,28 @@ import type {
   ProductsGetTypesResponse,
   UnitProductPostBodyBody,
   UnitProductPostResponse,
-} 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 Product Types you can purchase (subscribe to)
+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 all Product Types
- */
 export type getProductTypesResponse200 = { data: ProductsGetTypesResponse; status: 200 };
 
 export type getProductTypesResponse400 = { data: AsError; status: 400 };
@@ -69,6 +79,10 @@ export const getGetProductTypesUrl = () => {
   return `/product-type`;
 };
 
+/**
+ * Gets Product Types you can purchase (subscribe to)
+ * @summary Gets all Product Types
+ */
 export const getProductTypes = async (options?: RequestInit): Promise<getProductTypesResponse> => {
   return customFetch<getProductTypesResponse>(getGetProductTypesUrl(), {
     ...options,
@@ -98,7 +112,7 @@ export const getGetProductTypesQueryOptions = <
     Awaited<ReturnType<typeof getProductTypes>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductTypesQueryResult = NonNullable<Awaited<ReturnType<typeof getProductTypes>>>;
@@ -121,7 +135,7 @@ export function useGetProductTypes<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductTypes<
   TData = Awaited<ReturnType<typeof getProductTypes>>,
   TError = ErrorType<AsError | void>,
@@ -139,7 +153,7 @@ export function useGetProductTypes<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductTypes<
   TData = Awaited<ReturnType<typeof getProductTypes>>,
   TError = ErrorType<AsError | void>,
@@ -149,7 +163,7 @@ export function useGetProductTypes<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Product Types
  */
@@ -163,16 +177,14 @@ export function useGetProductTypes<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductTypesQueryOptions(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);
 }
 
 /**
@@ -207,7 +219,7 @@ export const getGetProductTypesSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductTypes>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductTypesSuspenseQueryResult = NonNullable<
@@ -226,7 +238,7 @@ export function useGetProductTypesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductTypesSuspense<
   TData = Awaited<ReturnType<typeof getProductTypes>>,
   TError = ErrorType<AsError | void>,
@@ -238,7 +250,7 @@ export function useGetProductTypesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductTypesSuspense<
   TData = Awaited<ReturnType<typeof getProductTypes>>,
   TError = ErrorType<AsError | void>,
@@ -250,7 +262,7 @@ export function useGetProductTypesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Product Types
  */
@@ -266,24 +278,17 @@ export function useGetProductTypesSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductTypesSuspenseQueryOptions(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);
 }
 
-/**
- * The storage cost is returned along with its measurement units, typically a Coin value based on the the peak storage that was measured on each billable day.
-
- * @summary Gets the default cross-product storage cost
- */
 export type getProductDefaultStorageCostResponse200 = {
   data: ProductsGetDefaultStorageCost;
   status: 200;
@@ -311,6 +316,10 @@ export const getGetProductDefaultStorageCostUrl = () => {
   return `/product-default-storage-cost`;
 };
 
+/**
+ * The storage cost is returned along with its measurement units, typically a Coin value based on the the peak storage that was measured on each billable day.
+ * @summary Gets the default cross-product storage cost
+ */
 export const getProductDefaultStorageCost = async (
   options?: RequestInit,
 ): Promise<getProductDefaultStorageCostResponse> => {
@@ -345,7 +354,7 @@ export const getGetProductDefaultStorageCostQueryOptions = <
     Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductDefaultStorageCostQueryResult = NonNullable<
@@ -372,7 +381,7 @@ export function useGetProductDefaultStorageCost<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductDefaultStorageCost<
   TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
   TError = ErrorType<AsError | void>,
@@ -392,7 +401,7 @@ export function useGetProductDefaultStorageCost<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductDefaultStorageCost<
   TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
   TError = ErrorType<AsError | void>,
@@ -404,7 +413,7 @@ export function useGetProductDefaultStorageCost<
     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 cross-product storage cost
  */
@@ -420,16 +429,14 @@ export function useGetProductDefaultStorageCost<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductDefaultStorageCostQueryOptions(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);
 }
 
 /**
@@ -468,7 +475,7 @@ export const getGetProductDefaultStorageCostSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductDefaultStorageCostSuspenseQueryResult = NonNullable<
@@ -491,7 +498,7 @@ export function useGetProductDefaultStorageCostSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductDefaultStorageCostSuspense<
   TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
   TError = ErrorType<AsError | void>,
@@ -507,7 +514,7 @@ export function useGetProductDefaultStorageCostSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductDefaultStorageCostSuspense<
   TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
   TError = ErrorType<AsError | void>,
@@ -523,7 +530,7 @@ export function useGetProductDefaultStorageCostSuspense<
     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 cross-product storage cost
  */
@@ -543,24 +550,17 @@ export function useGetProductDefaultStorageCostSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductDefaultStorageCostSuspenseQueryOptions(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);
 }
 
-/**
- * Gets Products you have access to, across all **Units** and **Organisations**
-
- * @summary Gets all Products
- */
 export type getProductsResponse200 = { data: ProductsGetResponse; status: 200 };
 
 export type getProductsResponse400 = { data: AsError; status: 400 };
@@ -582,6 +582,10 @@ export const getGetProductsUrl = () => {
   return `/product`;
 };
 
+/**
+ * Gets Products you have access to, across all **Units** and **Organisations**
+ * @summary Gets all Products
+ */
 export const getProducts = async (options?: RequestInit): Promise<getProductsResponse> => {
   return customFetch<getProductsResponse>(getGetProductsUrl(), { ...options, method: "GET" });
 };
@@ -608,7 +612,7 @@ export const getGetProductsQueryOptions = <
     Awaited<ReturnType<typeof getProducts>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductsQueryResult = NonNullable<Awaited<ReturnType<typeof getProducts>>>;
@@ -631,7 +635,7 @@ export function useGetProducts<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProducts<
   TData = Awaited<ReturnType<typeof getProducts>>,
   TError = ErrorType<AsError | void>,
@@ -649,7 +653,7 @@ export function useGetProducts<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProducts<
   TData = Awaited<ReturnType<typeof getProducts>>,
   TError = ErrorType<AsError | void>,
@@ -659,7 +663,7 @@ export function useGetProducts<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Products
  */
@@ -673,16 +677,14 @@ export function useGetProducts<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductsQueryOptions(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);
 }
 
 /**
@@ -715,7 +717,7 @@ export const getGetProductsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProducts>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProducts>>>;
@@ -730,7 +732,7 @@ export function useGetProductsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductsSuspense<
   TData = Awaited<ReturnType<typeof getProducts>>,
   TError = ErrorType<AsError | void>,
@@ -742,7 +744,7 @@ export function useGetProductsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductsSuspense<
   TData = Awaited<ReturnType<typeof getProducts>>,
   TError = ErrorType<AsError | void>,
@@ -754,7 +756,7 @@ export function useGetProductsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Products
  */
@@ -770,24 +772,17 @@ export function useGetProductsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductsSuspenseQueryOptions(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);
 }
 
-/**
- * Gets Products you have access to based on an **Organisation**
-
- * @summary Gets Products for an Organisation
- */
 export type getProductsForOrganisationResponse200 = { data: ProductsGetResponse; status: 200 };
 
 export type getProductsForOrganisationResponse401 = { data: void; status: 401 };
@@ -813,6 +808,10 @@ export const getGetProductsForOrganisationUrl = (orgId: string) => {
   return `/product/organisation/${orgId}`;
 };
 
+/**
+ * Gets Products you have access to based on an **Organisation**
+ * @summary Gets Products for an Organisation
+ */
 export const getProductsForOrganisation = async (
   orgId: string,
   options?: RequestInit,
@@ -823,7 +822,7 @@ export const getProductsForOrganisation = async (
   });
 };
 
-export const getGetProductsForOrganisationQueryKey = (orgId?: string) => {
+export const getGetProductsForOrganisationQueryKey = (orgId: string) => {
   return ["account-server", "product", "organisation", orgId] as const;
 };
 
@@ -847,11 +846,14 @@ export const getGetProductsForOrganisationQueryOptions = <
     signal,
   }) => getProductsForOrganisation(orgId, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!orgId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getProductsForOrganisation>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: orgId !== null && orgId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetProductsForOrganisationQueryResult = NonNullable<
@@ -879,7 +881,7 @@ export function useGetProductsForOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductsForOrganisation<
   TData = Awaited<ReturnType<typeof getProductsForOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -900,7 +902,7 @@ export function useGetProductsForOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductsForOrganisation<
   TData = Awaited<ReturnType<typeof getProductsForOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -913,7 +915,7 @@ export function useGetProductsForOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Products for an Organisation
  */
@@ -930,16 +932,14 @@ export function useGetProductsForOrganisation<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductsForOrganisationQueryOptions(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);
 }
 
 /**
@@ -982,7 +982,7 @@ export const getGetProductsForOrganisationSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductsForOrganisation>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductsForOrganisationSuspenseQueryResult = NonNullable<
@@ -1002,7 +1002,7 @@ export function useGetProductsForOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductsForOrganisationSuspense<
   TData = Awaited<ReturnType<typeof getProductsForOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -1015,7 +1015,7 @@ export function useGetProductsForOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductsForOrganisationSuspense<
   TData = Awaited<ReturnType<typeof getProductsForOrganisation>>,
   TError = ErrorType<void | AsError>,
@@ -1028,7 +1028,7 @@ export function useGetProductsForOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Products for an Organisation
  */
@@ -1045,32 +1045,17 @@ export function useGetProductsForOrganisationSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductsForOrganisationSuspenseQueryOptions(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);
 }
 
-/**
- * Products are **Subscriptions** that you create in a **Unit** that allow you to use services provided by a **Merchant**. To create products you need to be a member of the **Unit** or the Unit's **Organisation**.
-
-Supported subscription **types** include `DATA_MANAGER_STORAGE_SUBSCRIPTION`, and `DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION`.
-
-The `DATA_MANAGER_STORAGE_SUBSCRIPTION` **type** needs a **name**, an **allowance**, and an optional **limit** (that cannot be less than the **allowance**). If no **limit** is provided the **allowance** is used.
-
-The `DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION` **type** needs a **name**, and a **flavour**. The **flavour**, a string, should typically be one of `EVALUATION`, `BRONZE`, `SILVER` or `GOLD`.
-
-Users who are **Evaluators** can only create products in their Personal Unit, and where products support flavours, are restricted to `EVALUATION` flavours .
-
- * @summary Creates a Product for a Unit
- */
 export type createUnitProductResponse201 = { data: UnitProductPostResponse; status: 201 };
 
 export type createUnitProductResponse400 = { data: AsError; status: 400 };
@@ -1094,6 +1079,18 @@ export const getCreateUnitProductUrl = (unitId: string) => {
   return `/product/unit/${unitId}`;
 };
 
+/**
+ * Products are **Subscriptions** that you create in a **Unit** that allow you to use services provided by a **Merchant**. To create products you need to be a member of the **Unit** or the Unit's **Organisation**.
+ *
+ * Supported subscription **types** include `DATA_MANAGER_STORAGE_SUBSCRIPTION`, and `DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION`.
+ *
+ * The `DATA_MANAGER_STORAGE_SUBSCRIPTION` **type** needs a **name**, an **allowance**, and an optional **limit** (that cannot be less than the **allowance**). If no **limit** is provided the **allowance** is used.
+ *
+ * The `DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION` **type** needs a **name**, and a **flavour**. The **flavour**, a string, should typically be one of `EVALUATION`, `BRONZE`, `SILVER` or `GOLD`.
+ *
+ * Users who are **Evaluators** can only create products in their Personal Unit, and where products support flavours, are restricted to `EVALUATION` flavours .
+ * @summary Creates a Product for a Unit
+ */
 export const createUnitProduct = async (
   unitId: string,
   unitProductPostBodyBody: UnitProductPostBodyBody,
@@ -1169,15 +1166,8 @@ export const useCreateUnitProduct = <TError = ErrorType<AsError | void>, TContex
   { unitId: string; data: UnitProductPostBodyBody },
   TContext
 > => {
-  const mutationOptions = getCreateUnitProductMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getCreateUnitProductMutationOptions(options), queryClient);
 };
-/**
- * Gets products you have access to based on an Organisational **Unit**
-
- * @summary Gets Products for an Organisational Unit
- */
 export type getProductsForUnitResponse200 = { data: ProductsGetResponse; status: 200 };
 
 export type getProductsForUnitResponse401 = { data: void; status: 401 };
@@ -1203,6 +1193,10 @@ export const getGetProductsForUnitUrl = (unitId: string) => {
   return `/product/unit/${unitId}`;
 };
 
+/**
+ * Gets products you have access to based on an Organisational **Unit**
+ * @summary Gets Products for an Organisational Unit
+ */
 export const getProductsForUnit = async (
   unitId: string,
   options?: RequestInit,
@@ -1213,7 +1207,7 @@ export const getProductsForUnit = async (
   });
 };
 
-export const getGetProductsForUnitQueryKey = (unitId?: string) => {
+export const getGetProductsForUnitQueryKey = (unitId: string) => {
   return ["account-server", "product", "unit", unitId] as const;
 };
 
@@ -1234,11 +1228,14 @@ export const getGetProductsForUnitQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getProductsForUnit>>> = ({ signal }) =>
     getProductsForUnit(unitId, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!unitId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getProductsForUnit>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: unitId !== null && unitId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetProductsForUnitQueryResult = NonNullable<
@@ -1264,7 +1261,7 @@ export function useGetProductsForUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductsForUnit<
   TData = Awaited<ReturnType<typeof getProductsForUnit>>,
   TError = ErrorType<void | AsError>,
@@ -1285,7 +1282,7 @@ export function useGetProductsForUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductsForUnit<
   TData = Awaited<ReturnType<typeof getProductsForUnit>>,
   TError = ErrorType<void | AsError>,
@@ -1296,7 +1293,7 @@ export function useGetProductsForUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Products for an Organisational Unit
  */
@@ -1311,16 +1308,14 @@ export function useGetProductsForUnit<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductsForUnitQueryOptions(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);
 }
 
 /**
@@ -1359,7 +1354,7 @@ export const getGetProductsForUnitSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductsForUnit>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductsForUnitSuspenseQueryResult = NonNullable<
@@ -1379,7 +1374,7 @@ export function useGetProductsForUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductsForUnitSuspense<
   TData = Awaited<ReturnType<typeof getProductsForUnit>>,
   TError = ErrorType<void | AsError>,
@@ -1392,7 +1387,7 @@ export function useGetProductsForUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductsForUnitSuspense<
   TData = Awaited<ReturnType<typeof getProductsForUnit>>,
   TError = ErrorType<void | AsError>,
@@ -1405,7 +1400,7 @@ export function useGetProductsForUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Products for an Organisational Unit
  */
@@ -1422,24 +1417,17 @@ export function useGetProductsForUnitSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductsForUnitSuspenseQueryOptions(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);
 }
 
-/**
- * Gets details of a specific Product that you have access to.
-
- * @summary Gets a Product
- */
 export type getProductResponse200 = { data: ProductUnitGetResponse; status: 200 };
 
 export type getProductResponse400 = { data: AsError; status: 400 };
@@ -1461,6 +1449,10 @@ export const getGetProductUrl = (productId: string) => {
   return `/product/${productId}`;
 };
 
+/**
+ * Gets details of a specific Product that you have access to.
+ * @summary Gets a Product
+ */
 export const getProduct = async (
   productId: string,
   options?: RequestInit,
@@ -1471,7 +1463,7 @@ export const getProduct = async (
   });
 };
 
-export const getGetProductQueryKey = (productId?: string) => {
+export const getGetProductQueryKey = (productId: string) => {
   return ["account-server", "product", productId] as const;
 };
 
@@ -1492,11 +1484,14 @@ export const getGetProductQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getProduct>>> = ({ signal }) =>
     getProduct(productId, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!productId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getProduct>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: productId !== null && productId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetProductQueryResult = NonNullable<Awaited<ReturnType<typeof getProduct>>>;
@@ -1520,7 +1515,7 @@ export function useGetProduct<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProduct<
   TData = Awaited<ReturnType<typeof getProduct>>,
   TError = ErrorType<AsError | void>,
@@ -1539,7 +1534,7 @@ export function useGetProduct<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProduct<
   TData = Awaited<ReturnType<typeof getProduct>>,
   TError = ErrorType<AsError | void>,
@@ -1550,7 +1545,7 @@ export function useGetProduct<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets a Product
  */
@@ -1565,16 +1560,14 @@ export function useGetProduct<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductQueryOptions(productId, 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);
 }
 
 /**
@@ -1611,7 +1604,7 @@ export const getGetProductSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProduct>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProduct>>>;
@@ -1627,7 +1620,7 @@ export function useGetProductSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductSuspense<
   TData = Awaited<ReturnType<typeof getProduct>>,
   TError = ErrorType<AsError | void>,
@@ -1638,7 +1631,7 @@ export function useGetProductSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProductSuspense<
   TData = Awaited<ReturnType<typeof getProduct>>,
   TError = ErrorType<AsError | void>,
@@ -1649,7 +1642,7 @@ export function useGetProductSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets a Product
  */
@@ -1664,24 +1657,17 @@ export function useGetProductSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProductSuspenseQueryOptions(productId, 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);
 }
 
-/**
- * You need access to the Product and, if the Product is *claimable* the claim must be removed before the Product can be removed. An example claimable Product is a `DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION` where the *claimable* commodity is a Data Manager **Project**. In this case you will need to delete the Data Manager **Project** before you can delete the Account Server **Product**.
-
- * @summary Deletes an existing Product
- */
 export type deleteProductResponse204 = { data: void; status: 204 };
 
 export type deleteProductResponse401 = { data: void; status: 401 };
@@ -1703,6 +1689,10 @@ export const getDeleteProductUrl = (productId: string) => {
   return `/product/${productId}`;
 };
 
+/**
+ * You need access to the Product and, if the Product is *claimable* the claim must be removed before the Product can be removed. An example claimable Product is a `DATA_MANAGER_PROJECT_TIER_SUBSCRIPTION` where the *claimable* commodity is a Data Manager **Project**. In this case you will need to delete the Data Manager **Project** before you can delete the Account Server **Product**.
+ * @summary Deletes an existing Product
+ */
 export const deleteProduct = async (
   productId: string,
   options?: RequestInit,
@@ -1773,19 +1763,8 @@ export const useDeleteProduct = <TError = ErrorType<void | AsError>, TContext =
   { productId: string },
   TContext
 > => {
-  const mutationOptions = getDeleteProductMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getDeleteProductMutationOptions(options), queryClient);
 };
-/**
- * Used to update some adjustable parameters of a Product, i.e. to extend its **Allowance** or **Limit**.
-
-You must be a member of the **Unit**, or its **Organisation**, or an administrator to use this method.
-
-At the moment we only support Products associated with the Data Manager, and these can be patched by changing the `name`, its coin `allowance` or `limit`
-
- * @summary Adjust an existing Product
- */
 export type patchProductResponse200 = { data: void; status: 200 };
 
 export type patchProductResponse401 = { data: void; status: 401 };
@@ -1807,6 +1786,14 @@ export const getPatchProductUrl = (productId: string) => {
   return `/product/${productId}`;
 };
 
+/**
+ * Used to update some adjustable parameters of a Product, i.e. to extend its **Allowance** or **Limit**.
+ *
+ * You must be a member of the **Unit**, or its **Organisation**, or an administrator to use this method.
+ *
+ * At the moment we only support Products associated with the Data Manager, and these can be patched by changing the `name`, its coin `allowance` or `limit`
+ * @summary Adjust an existing Product
+ */
 export const patchProduct = async (
   productId: string,
   productPatchBodyBody: ProductPatchBodyBody,
@@ -1880,7 +1867,5 @@ export const usePatchProduct = <TError = ErrorType<void | AsError>, TContext = u
   { productId: string; data: ProductPatchBodyBody },
   TContext
 > => {
-  const mutationOptions = getPatchProductMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getPatchProductMutationOptions(options), queryClient);
 };