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

package/src/api/product/product.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,16 +36,30 @@ import type {
   ProductsGetTypesResponse,
   UnitProductPostBodyBody,
   UnitProductPostResponse,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customInstance } from "../../custom-axios";
 import type { ErrorType } from "../../custom-axios";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+const withQueryKey = <T extends object, K>(query: T, queryKey: K): T & { queryKey: K } => {
+  const result = { queryKey } as T & { queryKey: K };
+  for (const key of Object.keys(query)) {
+    // The explicit queryKey always wins, matching the previous
+    // `{ ...query, queryKey }` spread where it was set last.
+    if (key === "queryKey") continue;
+    Object.defineProperty(result, key, {
+      enumerable: true,
+      configurable: true,
+      get: () => (query as Record<string, unknown>)[key],
+    });
+  }
+  return result;
+};
+
 /**
  * Gets Product Types you can purchase (subscribe to)
-
  * @summary Gets all Product Types
  */
 export const getProductTypes = (
@@ -80,7 +94,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>>>;
@@ -103,7 +117,7 @@ export function useGetProductTypes<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -121,7 +135,7 @@ export function useGetProductTypes<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -131,7 +145,7 @@ export function useGetProductTypes<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Product Types
  */
@@ -145,16 +159,14 @@ export function useGetProductTypes<
     request?: SecondParameter<typeof customInstance>;
   },
   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);
 }
 
 /**
@@ -189,7 +201,7 @@ export const getGetProductTypesSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductTypes>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductTypesSuspenseQueryResult = NonNullable<
@@ -208,7 +220,7 @@ export function useGetProductTypesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -220,7 +232,7 @@ export function useGetProductTypesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -232,7 +244,7 @@ export function useGetProductTypesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Product Types
  */
@@ -248,22 +260,19 @@ export function useGetProductTypesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  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 const getProductDefaultStorageCost = (
@@ -301,7 +310,7 @@ export const getGetProductDefaultStorageCostQueryOptions = <
     Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductDefaultStorageCostQueryResult = NonNullable<
@@ -328,7 +337,7 @@ export function useGetProductDefaultStorageCost<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -348,7 +357,7 @@ export function useGetProductDefaultStorageCost<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -360,7 +369,7 @@ export function useGetProductDefaultStorageCost<
     request?: SecondParameter<typeof customInstance>;
   },
   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
  */
@@ -376,16 +385,14 @@ export function useGetProductDefaultStorageCost<
     request?: SecondParameter<typeof customInstance>;
   },
   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);
 }
 
 /**
@@ -424,7 +431,7 @@ export const getGetProductDefaultStorageCostSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductDefaultStorageCostSuspenseQueryResult = NonNullable<
@@ -447,7 +454,7 @@ export function useGetProductDefaultStorageCostSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -463,7 +470,7 @@ export function useGetProductDefaultStorageCostSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -479,7 +486,7 @@ export function useGetProductDefaultStorageCostSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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
  */
@@ -499,22 +506,19 @@ export function useGetProductDefaultStorageCostSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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 const getProducts = (
@@ -546,7 +550,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>>>;
@@ -569,7 +573,7 @@ export function useGetProducts<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -587,7 +591,7 @@ export function useGetProducts<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -597,7 +601,7 @@ export function useGetProducts<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Products
  */
@@ -611,16 +615,14 @@ export function useGetProducts<
     request?: SecondParameter<typeof customInstance>;
   },
   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);
 }
 
 /**
@@ -653,7 +655,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>>>;
@@ -668,7 +670,7 @@ export function useGetProductsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -680,7 +682,7 @@ export function useGetProductsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -692,7 +694,7 @@ export function useGetProductsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Products
  */
@@ -708,22 +710,19 @@ export function useGetProductsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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 const getProductsForOrganisation = (
@@ -737,7 +736,7 @@ export const getProductsForOrganisation = (
   );
 };
 
-export const getGetProductsForOrganisationQueryKey = (orgId?: string) => {
+export const getGetProductsForOrganisationQueryKey = (orgId: string) => {
   return ["account-server", "product", "organisation", orgId] as const;
 };
 
@@ -761,11 +760,14 @@ export const getGetProductsForOrganisationQueryOptions = <
     signal,
   }) => getProductsForOrganisation(orgId, requestOptions, signal);
 
-  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<
@@ -793,7 +795,7 @@ export function useGetProductsForOrganisation<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -814,7 +816,7 @@ export function useGetProductsForOrganisation<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -827,7 +829,7 @@ export function useGetProductsForOrganisation<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Products for an Organisation
  */
@@ -844,16 +846,14 @@ export function useGetProductsForOrganisation<
     request?: SecondParameter<typeof customInstance>;
   },
   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);
 }
 
 /**
@@ -896,7 +896,7 @@ export const getGetProductsForOrganisationSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductsForOrganisation>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductsForOrganisationSuspenseQueryResult = NonNullable<
@@ -916,7 +916,7 @@ export function useGetProductsForOrganisationSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -929,7 +929,7 @@ export function useGetProductsForOrganisationSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -942,7 +942,7 @@ export function useGetProductsForOrganisationSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Products for an Organisation
  */
@@ -959,30 +959,27 @@ export function useGetProductsForOrganisationSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  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 .
-
+ *
+ * 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 = (
@@ -1065,13 +1062,10 @@ 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 const getProductsForUnit = (
@@ -1085,7 +1079,7 @@ export const getProductsForUnit = (
   );
 };
 
-export const getGetProductsForUnitQueryKey = (unitId?: string) => {
+export const getGetProductsForUnitQueryKey = (unitId: string) => {
   return ["account-server", "product", "unit", unitId] as const;
 };
 
@@ -1106,11 +1100,14 @@ export const getGetProductsForUnitQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getProductsForUnit>>> = ({ signal }) =>
     getProductsForUnit(unitId, requestOptions, signal);
 
-  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<
@@ -1136,7 +1133,7 @@ export function useGetProductsForUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1157,7 +1154,7 @@ export function useGetProductsForUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1168,7 +1165,7 @@ export function useGetProductsForUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Products for an Organisational Unit
  */
@@ -1183,16 +1180,14 @@ export function useGetProductsForUnit<
     request?: SecondParameter<typeof customInstance>;
   },
   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);
 }
 
 /**
@@ -1231,7 +1226,7 @@ export const getGetProductsForUnitSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductsForUnit>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProductsForUnitSuspenseQueryResult = NonNullable<
@@ -1251,7 +1246,7 @@ export function useGetProductsForUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1264,7 +1259,7 @@ export function useGetProductsForUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1277,7 +1272,7 @@ export function useGetProductsForUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Products for an Organisational Unit
  */
@@ -1294,22 +1289,19 @@ export function useGetProductsForUnitSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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 const getProduct = (
@@ -1323,7 +1315,7 @@ export const getProduct = (
   );
 };
 
-export const getGetProductQueryKey = (productId?: string) => {
+export const getGetProductQueryKey = (productId: string) => {
   return ["account-server", "product", productId] as const;
 };
 
@@ -1344,11 +1336,14 @@ export const getGetProductQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getProduct>>> = ({ signal }) =>
     getProduct(productId, requestOptions, signal);
 
-  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>>>;
@@ -1372,7 +1367,7 @@ export function useGetProduct<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1391,7 +1386,7 @@ export function useGetProduct<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1402,7 +1397,7 @@ export function useGetProduct<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets a Product
  */
@@ -1417,16 +1412,14 @@ export function useGetProduct<
     request?: SecondParameter<typeof customInstance>;
   },
   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);
 }
 
 /**
@@ -1463,7 +1456,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>>>;
@@ -1479,7 +1472,7 @@ export function useGetProductSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1490,7 +1483,7 @@ export function useGetProductSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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>,
@@ -1501,7 +1494,7 @@ export function useGetProductSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets a Product
  */
@@ -1516,29 +1509,27 @@ export function useGetProductSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   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> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  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 const deleteProduct = (
   productId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<void>({ url: `/product/${productId}`, method: "DELETE" }, options);
+  return customInstance<void>({ url: `/product/${productId}`, method: "DELETE", signal }, options);
 };
 
 export const getDeleteProductMutationOptions = <
@@ -1601,23 +1592,21 @@ 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`
-
+ *
+ * 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 = (
   productId: string,
   productPatchBodyBody: ProductPatchBodyBody,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
     {
@@ -1625,6 +1614,7 @@ export const patchProduct = (
       method: "PATCH",
       headers: { "Content-Type": "application/json" },
       data: productPatchBodyBody,
+      signal,
     },
     options,
   );
@@ -1690,7 +1680,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);
 };