@squonk/account-server-client 4.1.0 → 4.1.1-rc.1

package/product/product.d.ts

@@ -1,4 +1,4 @@
-import { UseQueryOptions, QueryKey, DefinedInitialDataOptions, DefinedUseQueryResult, UndefinedInitialDataOptions, UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult, UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import { UseQueryOptions, DataTag, QueryKey, DefinedInitialDataOptions, DefinedUseQueryResult, UndefinedInitialDataOptions, UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult, UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
 import { customInstance, ProductsGetTypesResponse, ErrorType, AsError, ProductsGetDefaultStorageCost, ProductsGetResponse, UnitProductPostBodyBody, UnitProductPostResponse, ProductUnitGetResponse, ProductPatchBodyBody } from '../index.js';
 import 'axios';
 
@@ -14,7 +14,7 @@ declare const getGetProductTypesQueryOptions: <TData = ProductsGetTypesResponse,
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductTypesQueryResult = NonNullable<Awaited<ReturnType<typeof getProductTypes>>>;
 type GetProductTypesQueryError = ErrorType<AsError | void>;
@@ -22,25 +22,25 @@ declare function useGetProductTypes<TData = Awaited<ReturnType<typeof getProduct
     query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>> & Pick<DefinedInitialDataOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): DefinedUseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductTypes<TData = Awaited<ReturnType<typeof getProductTypes>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>> & Pick<UndefinedInitialDataOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductTypes<TData = Awaited<ReturnType<typeof getProductTypes>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare const getGetProductTypesSuspenseQueryOptions: <TData = ProductsGetTypesResponse, TError = ErrorType<void | AsError>>(options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductTypesSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProductTypes>>>;
 type GetProductTypesSuspenseQueryError = ErrorType<AsError | void>;
@@ -48,19 +48,19 @@ declare function useGetProductTypesSuspense<TData = Awaited<ReturnType<typeof ge
     query: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductTypesSuspense<TData = Awaited<ReturnType<typeof getProductTypes>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductTypesSuspense<TData = Awaited<ReturnType<typeof getProductTypes>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 /**
  * 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.
@@ -73,7 +73,7 @@ declare const getGetProductDefaultStorageCostQueryOptions: <TData = ProductsGetD
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductDefaultStorageCostQueryResult = NonNullable<Awaited<ReturnType<typeof getProductDefaultStorageCost>>>;
 type GetProductDefaultStorageCostQueryError = ErrorType<AsError | void>;
@@ -81,25 +81,25 @@ declare function useGetProductDefaultStorageCost<TData = Awaited<ReturnType<type
     query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>> & Pick<DefinedInitialDataOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): DefinedUseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductDefaultStorageCost<TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>> & Pick<UndefinedInitialDataOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductDefaultStorageCost<TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare const getGetProductDefaultStorageCostSuspenseQueryOptions: <TData = ProductsGetDefaultStorageCost, TError = ErrorType<void | AsError>>(options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductDefaultStorageCostSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProductDefaultStorageCost>>>;
 type GetProductDefaultStorageCostSuspenseQueryError = ErrorType<AsError | void>;
@@ -107,19 +107,19 @@ declare function useGetProductDefaultStorageCostSuspense<TData = Awaited<ReturnT
     query: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductDefaultStorageCostSuspense<TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductDefaultStorageCostSuspense<TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 /**
  * Gets Products you have access to, across all **Units** and **Organisations**
@@ -132,7 +132,7 @@ declare const getGetProductsQueryOptions: <TData = ProductsGetResponse, TError =
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductsQueryResult = NonNullable<Awaited<ReturnType<typeof getProducts>>>;
 type GetProductsQueryError = ErrorType<AsError | void>;
@@ -140,25 +140,25 @@ declare function useGetProducts<TData = Awaited<ReturnType<typeof getProducts>>,
     query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>> & Pick<DefinedInitialDataOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): DefinedUseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProducts<TData = Awaited<ReturnType<typeof getProducts>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>> & Pick<UndefinedInitialDataOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProducts<TData = Awaited<ReturnType<typeof getProducts>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare const getGetProductsSuspenseQueryOptions: <TData = ProductsGetResponse, TError = ErrorType<void | AsError>>(options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProducts>>>;
 type GetProductsSuspenseQueryError = ErrorType<AsError | void>;
@@ -166,19 +166,19 @@ declare function useGetProductsSuspense<TData = Awaited<ReturnType<typeof getPro
     query: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductsSuspense<TData = Awaited<ReturnType<typeof getProducts>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductsSuspense<TData = Awaited<ReturnType<typeof getProducts>>, TError = ErrorType<AsError | void>>(options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 /**
  * Gets Products you have access to based on an **Organisation**
@@ -191,7 +191,7 @@ declare const getGetProductsForOrganisationQueryOptions: <TData = ProductsGetRes
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductsForOrganisationQueryResult = NonNullable<Awaited<ReturnType<typeof getProductsForOrganisation>>>;
 type GetProductsForOrganisationQueryError = ErrorType<void | AsError>;
@@ -199,25 +199,25 @@ declare function useGetProductsForOrganisation<TData = Awaited<ReturnType<typeof
     query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>> & Pick<DefinedInitialDataOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): DefinedUseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductsForOrganisation<TData = Awaited<ReturnType<typeof getProductsForOrganisation>>, TError = ErrorType<void | AsError>>(orgId: string, options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>> & Pick<UndefinedInitialDataOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductsForOrganisation<TData = Awaited<ReturnType<typeof getProductsForOrganisation>>, TError = ErrorType<void | AsError>>(orgId: string, options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare const getGetProductsForOrganisationSuspenseQueryOptions: <TData = ProductsGetResponse, TError = ErrorType<void | AsError>>(orgId: string, options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductsForOrganisationSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProductsForOrganisation>>>;
 type GetProductsForOrganisationSuspenseQueryError = ErrorType<void | AsError>;
@@ -225,19 +225,19 @@ declare function useGetProductsForOrganisationSuspense<TData = Awaited<ReturnTyp
     query: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductsForOrganisationSuspense<TData = Awaited<ReturnType<typeof getProductsForOrganisation>>, TError = ErrorType<void | AsError>>(orgId: string, options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductsForOrganisationSuspense<TData = Awaited<ReturnType<typeof getProductsForOrganisation>>, TError = ErrorType<void | AsError>>(orgId: string, options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 /**
  * Products are **Subscriptions** that you create in a Unit and use **Merchant** services like the `DATA_MANAGER`.
@@ -250,14 +250,14 @@ To do this you need to be a member of the **Unit** or the **Organisation**.
 
  * @summary Creates a Product for an Organisational Unit
  */
-declare const createUnitProduct: (unitId: string, unitProductPostBodyBody: UnitProductPostBodyBody, options?: SecondParameter<typeof customInstance>) => Promise<UnitProductPostResponse>;
-declare const getCreateUnitProductMutationOptions: <TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
-    mutation?: UseMutationOptions<Awaited<ReturnType<typeof createUnitProduct>>, TError, {
+declare const createUnitProduct: (unitId: string, unitProductPostBodyBody: UnitProductPostBodyBody, options?: SecondParameter<typeof customInstance>, signal?: AbortSignal) => Promise<UnitProductPostResponse>;
+declare const getCreateUnitProductMutationOptions: <TData = UnitProductPostResponse, TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
+    mutation?: UseMutationOptions<TData, TError, {
         unitId: string;
         data: UnitProductPostBodyBody;
     }, TContext>;
     request?: SecondParameter<typeof customInstance>;
-}) => UseMutationOptions<Awaited<ReturnType<typeof createUnitProduct>>, TError, {
+}) => UseMutationOptions<TData, TError, {
     unitId: string;
     data: UnitProductPostBodyBody;
 }, TContext>;
@@ -267,13 +267,13 @@ type CreateUnitProductMutationError = ErrorType<AsError | void>;
 /**
 * @summary Creates a Product for an Organisational Unit
 */
-declare const useCreateUnitProduct: <TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
-    mutation?: UseMutationOptions<Awaited<ReturnType<typeof createUnitProduct>>, TError, {
+declare const useCreateUnitProduct: <TData = UnitProductPostResponse, TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
+    mutation?: UseMutationOptions<TData, TError, {
         unitId: string;
         data: UnitProductPostBodyBody;
     }, TContext>;
     request?: SecondParameter<typeof customInstance>;
-}) => UseMutationResult<Awaited<ReturnType<typeof createUnitProduct>>, TError, {
+}) => UseMutationResult<TData, TError, {
     unitId: string;
     data: UnitProductPostBodyBody;
 }, TContext>;
@@ -288,7 +288,7 @@ declare const getGetProductsForUnitQueryOptions: <TData = ProductsGetResponse, T
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductsForUnitQueryResult = NonNullable<Awaited<ReturnType<typeof getProductsForUnit>>>;
 type GetProductsForUnitQueryError = ErrorType<void | AsError>;
@@ -296,25 +296,25 @@ declare function useGetProductsForUnit<TData = Awaited<ReturnType<typeof getProd
     query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>> & Pick<DefinedInitialDataOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): DefinedUseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductsForUnit<TData = Awaited<ReturnType<typeof getProductsForUnit>>, TError = ErrorType<void | AsError>>(unitId: string, options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>> & Pick<UndefinedInitialDataOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductsForUnit<TData = Awaited<ReturnType<typeof getProductsForUnit>>, TError = ErrorType<void | AsError>>(unitId: string, options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare const getGetProductsForUnitSuspenseQueryOptions: <TData = ProductsGetResponse, TError = ErrorType<void | AsError>>(unitId: string, options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductsForUnitSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProductsForUnit>>>;
 type GetProductsForUnitSuspenseQueryError = ErrorType<void | AsError>;
@@ -322,19 +322,19 @@ declare function useGetProductsForUnitSuspense<TData = Awaited<ReturnType<typeof
     query: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductsForUnitSuspense<TData = Awaited<ReturnType<typeof getProductsForUnit>>, TError = ErrorType<void | AsError>>(unitId: string, options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductsForUnitSuspense<TData = Awaited<ReturnType<typeof getProductsForUnit>>, TError = ErrorType<void | AsError>>(unitId: string, options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 /**
  * Gets details of a specific Product that you have access to.
@@ -347,7 +347,7 @@ declare const getGetProductQueryOptions: <TData = ProductUnitGetResponse, TError
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductQueryResult = NonNullable<Awaited<ReturnType<typeof getProduct>>>;
 type GetProductQueryError = ErrorType<AsError | void>;
@@ -355,25 +355,25 @@ declare function useGetProduct<TData = Awaited<ReturnType<typeof getProduct>>, T
     query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>> & Pick<DefinedInitialDataOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): DefinedUseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProduct<TData = Awaited<ReturnType<typeof getProduct>>, TError = ErrorType<AsError | void>>(productId: string, options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>> & Pick<UndefinedInitialDataOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>, 'initialData'>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProduct<TData = Awaited<ReturnType<typeof getProduct>>, TError = ErrorType<AsError | void>>(productId: string, options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare const getGetProductSuspenseQueryOptions: <TData = ProductUnitGetResponse, TError = ErrorType<void | AsError>>(productId: string, options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 type GetProductSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProduct>>>;
 type GetProductSuspenseQueryError = ErrorType<AsError | void>;
@@ -381,19 +381,19 @@ declare function useGetProductSuspense<TData = Awaited<ReturnType<typeof getProd
     query: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductSuspense<TData = Awaited<ReturnType<typeof getProduct>>, TError = ErrorType<AsError | void>>(productId: string, options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 declare function useGetProductSuspense<TData = Awaited<ReturnType<typeof getProduct>>, TError = ErrorType<AsError | void>>(productId: string, options?: {
     query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
+    queryKey: DataTag<QueryKey, TData, TError>;
 };
 /**
  * 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**.
@@ -401,12 +401,12 @@ declare function useGetProductSuspense<TData = Awaited<ReturnType<typeof getProd
  * @summary Deletes an existing Product
  */
 declare const deleteProduct: (productId: string, options?: SecondParameter<typeof customInstance>) => Promise<void>;
-declare const getDeleteProductMutationOptions: <TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
-    mutation?: UseMutationOptions<Awaited<ReturnType<typeof deleteProduct>>, TError, {
+declare const getDeleteProductMutationOptions: <TData = void, TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
+    mutation?: UseMutationOptions<TData, TError, {
         productId: string;
     }, TContext>;
     request?: SecondParameter<typeof customInstance>;
-}) => UseMutationOptions<Awaited<ReturnType<typeof deleteProduct>>, TError, {
+}) => UseMutationOptions<TData, TError, {
     productId: string;
 }, TContext>;
 type DeleteProductMutationResult = NonNullable<Awaited<ReturnType<typeof deleteProduct>>>;
@@ -414,12 +414,12 @@ type DeleteProductMutationError = ErrorType<void | AsError>;
 /**
 * @summary Deletes an existing Product
 */
-declare const useDeleteProduct: <TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
-    mutation?: UseMutationOptions<Awaited<ReturnType<typeof deleteProduct>>, TError, {
+declare const useDeleteProduct: <TData = void, TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
+    mutation?: UseMutationOptions<TData, TError, {
         productId: string;
     }, TContext>;
     request?: SecondParameter<typeof customInstance>;
-}) => UseMutationResult<Awaited<ReturnType<typeof deleteProduct>>, TError, {
+}) => UseMutationResult<TData, TError, {
     productId: string;
 }, TContext>;
 /**
@@ -432,13 +432,13 @@ At the moment we only support Products associated with the Data Manager, and the
 * @summary Adjust an existing Product
 */
 declare const patchProduct: (productId: string, productPatchBodyBody: ProductPatchBodyBody, options?: SecondParameter<typeof customInstance>) => Promise<void>;
-declare const getPatchProductMutationOptions: <TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
-    mutation?: UseMutationOptions<Awaited<ReturnType<typeof patchProduct>>, TError, {
+declare const getPatchProductMutationOptions: <TData = void, TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
+    mutation?: UseMutationOptions<TData, TError, {
         productId: string;
         data: ProductPatchBodyBody;
     }, TContext>;
     request?: SecondParameter<typeof customInstance>;
-}) => UseMutationOptions<Awaited<ReturnType<typeof patchProduct>>, TError, {
+}) => UseMutationOptions<TData, TError, {
     productId: string;
     data: ProductPatchBodyBody;
 }, TContext>;
@@ -448,13 +448,13 @@ type PatchProductMutationError = ErrorType<void | AsError>;
 /**
 * @summary Adjust an existing Product
 */
-declare const usePatchProduct: <TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
-    mutation?: UseMutationOptions<Awaited<ReturnType<typeof patchProduct>>, TError, {
+declare const usePatchProduct: <TData = void, TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
+    mutation?: UseMutationOptions<TData, TError, {
         productId: string;
         data: ProductPatchBodyBody;
     }, TContext>;
     request?: SecondParameter<typeof customInstance>;
-}) => UseMutationResult<Awaited<ReturnType<typeof patchProduct>>, TError, {
+}) => UseMutationResult<TData, TError, {
     productId: string;
     data: ProductPatchBodyBody;
 }, TContext>;

package/product/product.js

@@ -148,7 +148,7 @@ var getGetProductsForOrganisationSuspenseQueryOptions = (orgId, options) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
   const queryKey = (queryOptions == null ? void 0 : queryOptions.queryKey) ?? getGetProductsForOrganisationQueryKey(orgId);
   const queryFn = ({ signal }) => getProductsForOrganisation(orgId, requestOptions, signal);
-  return { queryKey, queryFn, enabled: !!orgId, ...queryOptions };
+  return { queryKey, queryFn, ...queryOptions };
 };
 function useGetProductsForOrganisationSuspense(orgId, options) {
   const queryOptions = getGetProductsForOrganisationSuspenseQueryOptions(orgId, options);
@@ -156,19 +156,21 @@ function useGetProductsForOrganisationSuspense(orgId, options) {
   query.queryKey = queryOptions.queryKey;
   return query;
 }
-var createUnitProduct = (unitId, unitProductPostBodyBody, options) => {
+var createUnitProduct = (unitId, unitProductPostBodyBody, options, signal) => {
   return customInstance(
     {
       url: `/product/unit/${unitId}`,
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      data: unitProductPostBodyBody
+      data: unitProductPostBodyBody,
+      signal
     },
     options
   );
 };
 var getCreateUnitProductMutationOptions = (options) => {
-  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
+  const mutationKey = ["createUnitProduct"];
+  const { mutation: mutationOptions, request: requestOptions } = options ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey ? options : { ...options, mutation: { ...options.mutation, mutationKey } } : { mutation: { mutationKey }, request: void 0 };
   const mutationFn = (props) => {
     const { unitId, data } = props ?? {};
     return createUnitProduct(unitId, data, requestOptions);
@@ -208,7 +210,7 @@ var getGetProductsForUnitSuspenseQueryOptions = (unitId, options) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
   const queryKey = (queryOptions == null ? void 0 : queryOptions.queryKey) ?? getGetProductsForUnitQueryKey(unitId);
   const queryFn = ({ signal }) => getProductsForUnit(unitId, requestOptions, signal);
-  return { queryKey, queryFn, enabled: !!unitId, ...queryOptions };
+  return { queryKey, queryFn, ...queryOptions };
 };
 function useGetProductsForUnitSuspense(unitId, options) {
   const queryOptions = getGetProductsForUnitSuspenseQueryOptions(unitId, options);
@@ -245,7 +247,7 @@ var getGetProductSuspenseQueryOptions = (productId, options) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
   const queryKey = (queryOptions == null ? void 0 : queryOptions.queryKey) ?? getGetProductQueryKey(productId);
   const queryFn = ({ signal }) => getProduct(productId, requestOptions, signal);
-  return { queryKey, queryFn, enabled: !!productId, ...queryOptions };
+  return { queryKey, queryFn, ...queryOptions };
 };
 function useGetProductSuspense(productId, options) {
   const queryOptions = getGetProductSuspenseQueryOptions(productId, options);
@@ -263,7 +265,8 @@ var deleteProduct = (productId, options) => {
   );
 };
 var getDeleteProductMutationOptions = (options) => {
-  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
+  const mutationKey = ["deleteProduct"];
+  const { mutation: mutationOptions, request: requestOptions } = options ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey ? options : { ...options, mutation: { ...options.mutation, mutationKey } } : { mutation: { mutationKey }, request: void 0 };
   const mutationFn = (props) => {
     const { productId } = props ?? {};
     return deleteProduct(productId, requestOptions);
@@ -286,7 +289,8 @@ var patchProduct = (productId, productPatchBodyBody, options) => {
   );
 };
 var getPatchProductMutationOptions = (options) => {
-  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
+  const mutationKey = ["patchProduct"];
+  const { mutation: mutationOptions, request: requestOptions } = options ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey ? options : { ...options, mutation: { ...options.mutation, mutationKey } } : { mutation: { mutationKey }, request: void 0 };
   const mutationFn = (props) => {
     const { productId, data } = props ?? {};
     return patchProduct(productId, data, requestOptions);