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

package/src/api/merchant/merchant.ts

@@ -1,11 +1,11 @@
 /**
- * Generated by orval v7.17.0 🍺
+ * Generated by orval v8.22.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
-
-A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
-
+ *
+ * A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
+ *
  * OpenAPI spec version: 4.7
  */
 import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
@@ -24,18 +24,32 @@ import type {
   UseSuspenseQueryResult,
 } from "@tanstack/react-query";
 
-import type { AsError, MerchantDetail, MerchantsGetResponse } from ".././api-schemas";
+import type { AsError, MerchantDetail, MerchantsGetResponse } from "../api-schemas";
 
 import { customInstance } from "../../custom-axios";
 import type { ErrorType } from "../../custom-axios";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+const withQueryKey = <T extends object, K>(query: T, queryKey: K): T & { queryKey: K } => {
+  const result = { queryKey } as T & { queryKey: K };
+  for (const key of Object.keys(query)) {
+    // The explicit queryKey always wins, matching the previous
+    // `{ ...query, queryKey }` spread where it was set last.
+    if (key === "queryKey") continue;
+    Object.defineProperty(result, key, {
+      enumerable: true,
+      configurable: true,
+      get: () => (query as Record<string, unknown>)[key],
+    });
+  }
+  return result;
+};
+
 /**
  * Gets Merchants known to the Account Server
-
-Merchants are software services (SaaS assets) whose facilities are known to and controlled by the Account Server
-
+ *
+ * Merchants are software services (SaaS assets) whose facilities are known to and controlled by the Account Server
  * @summary Gets all Merchants
  */
 export const getMerchants = (
@@ -67,7 +81,7 @@ export const getGetMerchantsQueryOptions = <
     Awaited<ReturnType<typeof getMerchants>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetMerchantsQueryResult = NonNullable<Awaited<ReturnType<typeof getMerchants>>>;
@@ -90,7 +104,7 @@ export function useGetMerchants<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetMerchants<
   TData = Awaited<ReturnType<typeof getMerchants>>,
   TError = ErrorType<AsError | void>,
@@ -108,7 +122,7 @@ export function useGetMerchants<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetMerchants<
   TData = Awaited<ReturnType<typeof getMerchants>>,
   TError = ErrorType<AsError | void>,
@@ -118,7 +132,7 @@ export function useGetMerchants<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Merchants
  */
@@ -132,16 +146,14 @@ export function useGetMerchants<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetMerchantsQueryOptions(options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -174,7 +186,7 @@ export const getGetMerchantsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getMerchants>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetMerchantsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getMerchants>>>;
@@ -191,7 +203,7 @@ export function useGetMerchantsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetMerchantsSuspense<
   TData = Awaited<ReturnType<typeof getMerchants>>,
   TError = ErrorType<AsError | void>,
@@ -203,7 +215,7 @@ export function useGetMerchantsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetMerchantsSuspense<
   TData = Awaited<ReturnType<typeof getMerchants>>,
   TError = ErrorType<AsError | void>,
@@ -215,7 +227,7 @@ export function useGetMerchantsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Merchants
  */
@@ -231,22 +243,19 @@ export function useGetMerchantsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetMerchantsSuspenseQueryOptions(options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
  * Gets a known Merchant
-
  * @summary Gets a specific Merchant
  */
 export const getService = (
@@ -260,7 +269,7 @@ export const getService = (
   );
 };
 
-export const getGetServiceQueryKey = (mId?: number) => {
+export const getGetServiceQueryKey = (mId: number) => {
   return ["account-server", "merchant", mId] as const;
 };
 
@@ -281,11 +290,14 @@ export const getGetServiceQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getService>>> = ({ signal }) =>
     getService(mId, requestOptions, signal);
 
-  return { queryKey, queryFn, enabled: !!mId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getService>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: mId !== null && mId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getService>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetServiceQueryResult = NonNullable<Awaited<ReturnType<typeof getService>>>;
@@ -309,7 +321,7 @@ export function useGetService<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetService<
   TData = Awaited<ReturnType<typeof getService>>,
   TError = ErrorType<AsError | void>,
@@ -328,7 +340,7 @@ export function useGetService<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetService<
   TData = Awaited<ReturnType<typeof getService>>,
   TError = ErrorType<AsError | void>,
@@ -339,7 +351,7 @@ export function useGetService<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets a specific Merchant
  */
@@ -354,16 +366,14 @@ export function useGetService<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetServiceQueryOptions(mId, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -400,7 +410,7 @@ export const getGetServiceSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getService>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetServiceSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getService>>>;
@@ -416,7 +426,7 @@ export function useGetServiceSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetServiceSuspense<
   TData = Awaited<ReturnType<typeof getService>>,
   TError = ErrorType<AsError | void>,
@@ -427,7 +437,7 @@ export function useGetServiceSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetServiceSuspense<
   TData = Awaited<ReturnType<typeof getService>>,
   TError = ErrorType<AsError | void>,
@@ -438,7 +448,7 @@ export function useGetServiceSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets a specific Merchant
  */
@@ -453,15 +463,13 @@ export function useGetServiceSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetServiceSuspenseQueryOptions(mId, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }