@squonk/account-server-client 4.4.0-4-4.2197069952 → 4.4.0-4-4.2199390673

package/src/api/product/product.ts

@@ -10,11 +10,15 @@ A service that provides access to the Account Server, which gives *registered* u
  */
 import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
+  DataTag,
+  DefinedInitialDataOptions,
+  DefinedUseQueryResult,
   InvalidateOptions,
   MutationFunction,
   QueryClient,
   QueryFunction,
   QueryKey,
+  UndefinedInitialDataOptions,
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
@@ -62,7 +66,7 @@ export const getGetProductTypesQueryOptions = <
   TData = Awaited<ReturnType<typeof getProductTypes>>,
   TError = ErrorType<AsError | void>,
 >(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>;
+  query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>>;
   request?: SecondParameter<typeof customInstance>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -76,12 +80,58 @@ export const getGetProductTypesQueryOptions = <
     Awaited<ReturnType<typeof getProductTypes>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductTypesQueryResult = NonNullable<Awaited<ReturnType<typeof getProductTypes>>>;
 export type GetProductTypesQueryError = ErrorType<AsError | void>;
 
+export function useGetProductTypes<
+  TData = Awaited<ReturnType<typeof getProductTypes>>,
+  TError = ErrorType<AsError | void>,
+>(
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getProductTypes>>,
+          TError,
+          Awaited<ReturnType<typeof getProductTypes>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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,
+          Awaited<ReturnType<typeof getProductTypes>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets all Product Types
  */
@@ -89,13 +139,18 @@ export type GetProductTypesQueryError = ErrorType<AsError | void>;
 export function useGetProductTypes<
   TData = Awaited<ReturnType<typeof getProductTypes>>,
   TError = ErrorType<AsError | void>,
->(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>;
-  request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductTypesQueryOptions(options);
 
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData>;
+  };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -118,7 +173,9 @@ export const getGetProductTypesSuspenseQueryOptions = <
   TData = Awaited<ReturnType<typeof getProductTypes>>,
   TError = ErrorType<AsError | void>,
 >(options?: {
-  query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>;
+  query?: Partial<
+    UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>
+  >;
   request?: SecondParameter<typeof customInstance>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -132,7 +189,7 @@ export const getGetProductTypesSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductTypes>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductTypesSuspenseQueryResult = NonNullable<
@@ -140,6 +197,42 @@ export type GetProductTypesSuspenseQueryResult = NonNullable<
 >;
 export type GetProductTypesSuspenseQueryError = ErrorType<AsError | void>;
 
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets all Product Types
  */
@@ -147,15 +240,21 @@ export type GetProductTypesSuspenseQueryError = ErrorType<AsError | void>;
 export function useGetProductTypesSuspense<
   TData = Awaited<ReturnType<typeof getProductTypes>>,
   TError = ErrorType<AsError | void>,
->(options?: {
-  query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>;
-  request?: SecondParameter<typeof customInstance>;
-}): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductTypesSuspenseQueryOptions(options);
 
-  const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData> };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -185,7 +284,9 @@ export const getGetProductDefaultStorageCostQueryOptions = <
   TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
   TError = ErrorType<AsError | void>,
 >(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>;
+  query?: Partial<
+    UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>
+  >;
   request?: SecondParameter<typeof customInstance>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -200,7 +301,7 @@ export const getGetProductDefaultStorageCostQueryOptions = <
     Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductDefaultStorageCostQueryResult = NonNullable<
@@ -208,6 +309,58 @@ export type GetProductDefaultStorageCostQueryResult = NonNullable<
 >;
 export type GetProductDefaultStorageCostQueryError = ErrorType<AsError | void>;
 
+export function useGetProductDefaultStorageCost<
+  TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
+  TError = ErrorType<AsError | void>,
+>(
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
+          TError,
+          Awaited<ReturnType<typeof getProductDefaultStorageCost>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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,
+          Awaited<ReturnType<typeof getProductDefaultStorageCost>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets the default cross-product storage cost
  */
@@ -215,13 +368,20 @@ export type GetProductDefaultStorageCostQueryError = ErrorType<AsError | void>;
 export function useGetProductDefaultStorageCost<
   TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
   TError = ErrorType<AsError | void>,
->(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>;
-  request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductDefaultStorageCostQueryOptions(options);
 
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData>;
+  };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -247,10 +407,8 @@ export const getGetProductDefaultStorageCostSuspenseQueryOptions = <
   TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
   TError = ErrorType<AsError | void>,
 >(options?: {
-  query?: UseSuspenseQueryOptions<
-    Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
-    TError,
-    TData
+  query?: Partial<
+    UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>
   >;
   request?: SecondParameter<typeof customInstance>;
 }) => {
@@ -266,7 +424,7 @@ export const getGetProductDefaultStorageCostSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductDefaultStorageCostSuspenseQueryResult = NonNullable<
@@ -274,6 +432,54 @@ export type GetProductDefaultStorageCostSuspenseQueryResult = NonNullable<
 >;
 export type GetProductDefaultStorageCostSuspenseQueryError = ErrorType<AsError | void>;
 
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets the default cross-product storage cost
  */
@@ -281,19 +487,25 @@ export type GetProductDefaultStorageCostSuspenseQueryError = ErrorType<AsError |
 export function useGetProductDefaultStorageCostSuspense<
   TData = Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
   TError = ErrorType<AsError | void>,
->(options?: {
-  query?: UseSuspenseQueryOptions<
-    Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
-    TError,
-    TData
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<
+        Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
+        TError,
+        TData
+      >
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductDefaultStorageCostSuspenseQueryOptions(options);
 
-  const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData> };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -320,7 +532,7 @@ export const getGetProductsQueryOptions = <
   TData = Awaited<ReturnType<typeof getProducts>>,
   TError = ErrorType<AsError | void>,
 >(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>;
+  query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>>;
   request?: SecondParameter<typeof customInstance>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -334,12 +546,58 @@ export const getGetProductsQueryOptions = <
     Awaited<ReturnType<typeof getProducts>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductsQueryResult = NonNullable<Awaited<ReturnType<typeof getProducts>>>;
 export type GetProductsQueryError = ErrorType<AsError | void>;
 
+export function useGetProducts<
+  TData = Awaited<ReturnType<typeof getProducts>>,
+  TError = ErrorType<AsError | void>,
+>(
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getProducts>>,
+          TError,
+          Awaited<ReturnType<typeof getProducts>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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,
+          Awaited<ReturnType<typeof getProducts>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets all Products
  */
@@ -347,13 +605,18 @@ export type GetProductsQueryError = ErrorType<AsError | void>;
 export function useGetProducts<
   TData = Awaited<ReturnType<typeof getProducts>>,
   TError = ErrorType<AsError | void>,
->(options?: {
-  query?: UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>;
-  request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductsQueryOptions(options);
 
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData>;
+  };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -376,7 +639,7 @@ export const getGetProductsSuspenseQueryOptions = <
   TData = Awaited<ReturnType<typeof getProducts>>,
   TError = ErrorType<AsError | void>,
 >(options?: {
-  query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>;
+  query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>>;
   request?: SecondParameter<typeof customInstance>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -390,12 +653,46 @@ export const getGetProductsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProducts>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProducts>>>;
 export type GetProductsSuspenseQueryError = ErrorType<AsError | void>;
 
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets all Products
  */
@@ -403,15 +700,21 @@ export type GetProductsSuspenseQueryError = ErrorType<AsError | void>;
 export function useGetProductsSuspense<
   TData = Awaited<ReturnType<typeof getProducts>>,
   TError = ErrorType<AsError | void>,
->(options?: {
-  query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>;
-  request?: SecondParameter<typeof customInstance>;
-}): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductsSuspenseQueryOptions(options);
 
-  const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData> };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -444,7 +747,9 @@ export const getGetProductsForOrganisationQueryOptions = <
 >(
   orgId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>;
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
 ) => {
@@ -460,7 +765,7 @@ export const getGetProductsForOrganisationQueryOptions = <
     Awaited<ReturnType<typeof getProductsForOrganisation>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductsForOrganisationQueryResult = NonNullable<
@@ -468,6 +773,61 @@ export type GetProductsForOrganisationQueryResult = NonNullable<
 >;
 export type GetProductsForOrganisationQueryError = ErrorType<void | AsError>;
 
+export function useGetProductsForOrganisation<
+  TData = Awaited<ReturnType<typeof getProductsForOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getProductsForOrganisation>>,
+          TError,
+          Awaited<ReturnType<typeof getProductsForOrganisation>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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,
+          Awaited<ReturnType<typeof getProductsForOrganisation>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Products for an Organisation
  */
@@ -478,13 +838,18 @@ export function useGetProductsForOrganisation<
 >(
   orgId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>;
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductsForOrganisationQueryOptions(orgId, options);
 
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData>;
+  };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -513,10 +878,8 @@ export const getGetProductsForOrganisationSuspenseQueryOptions = <
 >(
   orgId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<
-      Awaited<ReturnType<typeof getProductsForOrganisation>>,
-      TError,
-      TData
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
@@ -533,7 +896,7 @@ export const getGetProductsForOrganisationSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductsForOrganisation>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductsForOrganisationSuspenseQueryResult = NonNullable<
@@ -541,6 +904,45 @@ export type GetProductsForOrganisationSuspenseQueryResult = NonNullable<
 >;
 export type GetProductsForOrganisationSuspenseQueryError = ErrorType<void | AsError>;
 
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Products for an Organisation
  */
@@ -551,19 +953,19 @@ export function useGetProductsForOrganisationSuspense<
 >(
   orgId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<
-      Awaited<ReturnType<typeof getProductsForOrganisation>>,
-      TError,
-      TData
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForOrganisation>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
-): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductsForOrganisationSuspenseQueryOptions(orgId, options);
 
-  const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData> };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -646,18 +1048,18 @@ export type CreateUnitProductMutationError = ErrorType<AsError | void>;
 /**
  * @summary Creates a Product for a Unit
  */
-export const useCreateUnitProduct = <
-  TError = ErrorType<AsError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createUnitProduct>>,
-    TError,
-    { unitId: string; data: UnitProductPostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationResult<
+export const useCreateUnitProduct = <TError = ErrorType<AsError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof createUnitProduct>>,
+      TError,
+      { unitId: string; data: UnitProductPostBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof createUnitProduct>>,
   TError,
   { unitId: string; data: UnitProductPostBodyBody },
@@ -665,7 +1067,7 @@ export const useCreateUnitProduct = <
 > => {
   const mutationOptions = getCreateUnitProductMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Gets products you have access to based on an Organisational **Unit**
@@ -693,7 +1095,7 @@ export const getGetProductsForUnitQueryOptions = <
 >(
   unitId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
 ) => {
@@ -708,7 +1110,7 @@ export const getGetProductsForUnitQueryOptions = <
     Awaited<ReturnType<typeof getProductsForUnit>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductsForUnitQueryResult = NonNullable<
@@ -716,6 +1118,57 @@ export type GetProductsForUnitQueryResult = NonNullable<
 >;
 export type GetProductsForUnitQueryError = ErrorType<void | AsError>;
 
+export function useGetProductsForUnit<
+  TData = Awaited<ReturnType<typeof getProductsForUnit>>,
+  TError = ErrorType<void | AsError>,
+>(
+  unitId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getProductsForUnit>>,
+          TError,
+          Awaited<ReturnType<typeof getProductsForUnit>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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,
+          Awaited<ReturnType<typeof getProductsForUnit>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Products for an Organisational Unit
  */
@@ -726,13 +1179,16 @@ export function useGetProductsForUnit<
 >(
   unitId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductsForUnitQueryOptions(unitId, options);
 
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData>;
+  };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -758,7 +1214,9 @@ export const getGetProductsForUnitSuspenseQueryOptions = <
 >(
   unitId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>;
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
 ) => {
@@ -773,7 +1231,7 @@ export const getGetProductsForUnitSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductsForUnit>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductsForUnitSuspenseQueryResult = NonNullable<
@@ -781,6 +1239,45 @@ export type GetProductsForUnitSuspenseQueryResult = NonNullable<
 >;
 export type GetProductsForUnitSuspenseQueryError = ErrorType<void | AsError>;
 
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Products for an Organisational Unit
  */
@@ -791,15 +1288,19 @@ export function useGetProductsForUnitSuspense<
 >(
   unitId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>;
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductsForUnit>>, TError, TData>
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
-): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductsForUnitSuspenseQueryOptions(unitId, options);
 
-  const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData> };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -832,7 +1333,7 @@ export const getGetProductQueryOptions = <
 >(
   productId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
 ) => {
@@ -847,12 +1348,61 @@ export const getGetProductQueryOptions = <
     Awaited<ReturnType<typeof getProduct>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductQueryResult = NonNullable<Awaited<ReturnType<typeof getProduct>>>;
 export type GetProductQueryError = ErrorType<AsError | void>;
 
+export function useGetProduct<
+  TData = Awaited<ReturnType<typeof getProduct>>,
+  TError = ErrorType<AsError | void>,
+>(
+  productId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof getProduct>>,
+          TError,
+          Awaited<ReturnType<typeof getProduct>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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,
+          Awaited<ReturnType<typeof getProduct>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets a Product
  */
@@ -863,13 +1413,16 @@ export function useGetProduct<
 >(
   productId: string,
   options?: {
-    query?: UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductQueryOptions(productId, options);
 
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData>;
+  };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -895,7 +1448,7 @@ export const getGetProductSuspenseQueryOptions = <
 >(
   productId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>;
+    query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
 ) => {
@@ -910,12 +1463,45 @@ export const getGetProductSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProduct>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProduct>>>;
 export type GetProductSuspenseQueryError = ErrorType<AsError | void>;
 
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+export 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>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets a Product
  */
@@ -926,15 +1512,17 @@ export function useGetProductSuspense<
 >(
   productId: string,
   options?: {
-    query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>;
+    query?: Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProduct>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
-): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
   const queryOptions = getGetProductSuspenseQueryOptions(productId, options);
 
-  const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData> };
 
   query.queryKey = queryOptions.queryKey;
 
@@ -996,15 +1584,18 @@ export type DeleteProductMutationError = ErrorType<void | AsError>;
 /**
  * @summary Deletes an existing Product
  */
-export const useDeleteProduct = <TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteProduct>>,
-    TError,
-    { productId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationResult<
+export const useDeleteProduct = <TError = ErrorType<void | AsError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteProduct>>,
+      TError,
+      { productId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof deleteProduct>>,
   TError,
   { productId: string },
@@ -1012,7 +1603,7 @@ export const useDeleteProduct = <TError = ErrorType<void | AsError>, TContext =
 > => {
   const mutationOptions = getDeleteProductMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };
 /**
  * Used to update some adjustable parameters of a Product, i.e. to extend its **Allowance** or **Limit**.
@@ -1082,15 +1673,18 @@ export type PatchProductMutationError = ErrorType<void | AsError>;
 /**
  * @summary Adjust an existing Product
  */
-export const usePatchProduct = <TError = ErrorType<void | AsError>, TContext = unknown>(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof patchProduct>>,
-    TError,
-    { productId: string; data: ProductPatchBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationResult<
+export const usePatchProduct = <TError = ErrorType<void | AsError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof patchProduct>>,
+      TError,
+      { productId: string; data: ProductPatchBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof patchProduct>>,
   TError,
   { productId: string; data: ProductPatchBodyBody },
@@ -1098,5 +1692,5 @@ export const usePatchProduct = <TError = ErrorType<void | AsError>, TContext = u
 > => {
   const mutationOptions = getPatchProductMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };