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

package/src/api/product/product.fetch.ts

@@ -10,11 +10,15 @@ A service that provides access to the Account Server, which gives *registered* u
  */
 import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
+  DataTag,
+  DefinedInitialDataOptions,
+  DefinedUseQueryResult,
   InvalidateOptions,
   MutationFunction,
   QueryClient,
   QueryFunction,
   QueryKey,
+  UndefinedInitialDataOptions,
   UseMutationOptions,
   UseMutationResult,
   UseQueryOptions,
@@ -80,7 +84,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 customFetch>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -94,12 +98,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets all Product Types
  */
@@ -107,13 +157,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 customFetch>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  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;
 
@@ -136,7 +191,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 customFetch>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -150,7 +207,7 @@ export const getGetProductTypesSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductTypes>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductTypesSuspenseQueryResult = NonNullable<
@@ -158,6 +215,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets all Product Types
  */
@@ -165,15 +258,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 customFetch>;
-}): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProductTypes>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  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;
 
@@ -229,7 +328,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 customFetch>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -244,7 +345,7 @@ export const getGetProductDefaultStorageCostQueryOptions = <
     Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductDefaultStorageCostQueryResult = NonNullable<
@@ -252,6 +353,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets the default cross-product storage cost
  */
@@ -259,13 +412,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 customFetch>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getProductDefaultStorageCost>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  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;
 
@@ -291,10 +451,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 customFetch>;
 }) => {
@@ -310,7 +468,7 @@ export const getGetProductDefaultStorageCostSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductDefaultStorageCostSuspenseQueryResult = NonNullable<
@@ -318,6 +476,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets the default cross-product storage cost
  */
@@ -325,19 +531,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 customFetch>;
-}): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<
+        Awaited<ReturnType<typeof getProductDefaultStorageCost>>,
+        TError,
+        TData
+      >
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  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;
 
@@ -382,7 +594,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 customFetch>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -396,12 +608,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets all Products
  */
@@ -409,13 +667,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 customFetch>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  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;
 
@@ -438,7 +701,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 customFetch>;
 }) => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
@@ -452,12 +715,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets all Products
  */
@@ -465,15 +762,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 customFetch>;
-}): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getProducts>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  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;
 
@@ -530,7 +833,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 customFetch>;
   },
 ) => {
@@ -546,7 +851,7 @@ export const getGetProductsForOrganisationQueryOptions = <
     Awaited<ReturnType<typeof getProductsForOrganisation>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductsForOrganisationQueryResult = NonNullable<
@@ -554,6 +859,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Products for an Organisation
  */
@@ -564,13 +924,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 customFetch>;
   },
-): 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;
 
@@ -599,10 +964,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 customFetch>;
   },
@@ -619,7 +982,7 @@ export const getGetProductsForOrganisationSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductsForOrganisation>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductsForOrganisationSuspenseQueryResult = NonNullable<
@@ -627,6 +990,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Products for an Organisation
  */
@@ -637,19 +1039,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 customFetch>;
   },
-): 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;
 
@@ -750,18 +1152,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 customFetch>;
-}): 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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof createUnitProduct>>,
   TError,
   { unitId: string; data: UnitProductPostBodyBody },
@@ -769,7 +1171,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**
@@ -821,7 +1223,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 customFetch>;
   },
 ) => {
@@ -836,7 +1238,7 @@ export const getGetProductsForUnitQueryOptions = <
     Awaited<ReturnType<typeof getProductsForUnit>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductsForUnitQueryResult = NonNullable<
@@ -844,6 +1246,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Products for an Organisational Unit
  */
@@ -854,13 +1307,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 customFetch>;
   },
-): 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;
 
@@ -886,7 +1342,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 customFetch>;
   },
 ) => {
@@ -901,7 +1359,7 @@ export const getGetProductsForUnitSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProductsForUnit>>,
     TError,
     TData
-  > & { queryKey: QueryKey };
+  > & { queryKey: DataTag<QueryKey, TData> };
 };
 
 export type GetProductsForUnitSuspenseQueryResult = NonNullable<
@@ -909,6 +1367,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets Products for an Organisational Unit
  */
@@ -919,15 +1416,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 customFetch>;
   },
-): 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;
 
@@ -980,7 +1481,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 customFetch>;
   },
 ) => {
@@ -995,12 +1496,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets a Product
  */
@@ -1011,13 +1561,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 customFetch>;
   },
-): 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;
 
@@ -1043,7 +1596,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 customFetch>;
   },
 ) => {
@@ -1058,12 +1611,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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
 /**
  * @summary Gets a Product
  */
@@ -1074,15 +1660,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 customFetch>;
   },
-): 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;
 
@@ -1168,15 +1756,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 customFetch>;
-}): UseMutationResult<
+export const useDeleteProduct = <TError = ErrorType<void | AsError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteProduct>>,
+      TError,
+      { productId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof deleteProduct>>,
   TError,
   { productId: string },
@@ -1184,7 +1775,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**.
@@ -1272,15 +1863,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 customFetch>;
-}): 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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<
   Awaited<ReturnType<typeof patchProduct>>,
   TError,
   { productId: string; data: ProductPatchBodyBody },
@@ -1288,5 +1882,5 @@ export const usePatchProduct = <TError = ErrorType<void | AsError>, TContext = u
 > => {
   const mutationOptions = getPatchProductMutationOptions(options);
 
-  return useMutation(mutationOptions);
+  return useMutation(mutationOptions, queryClient);
 };