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

package/src/api/event-stream/event-stream.ts

@@ -1,11 +1,11 @@
 /**
- * Generated by orval v7.17.0 🍺
+ * Generated by orval v8.22.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
-
-A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
-
+ *
+ * A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
+ *
  * OpenAPI spec version: 4.7
  */
 import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
@@ -32,16 +32,30 @@ import type {
   EventStreamGetPostResponse,
   EventStreamPostBodyBody,
   EventStreamVersionGetResponse,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customInstance } from "../../custom-axios";
 import type { ErrorType } from "../../custom-axios";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+const withQueryKey = <T extends object, K>(query: T, queryKey: K): T & { queryKey: K } => {
+  const result = { queryKey } as T & { queryKey: K };
+  for (const key of Object.keys(query)) {
+    // The explicit queryKey always wins, matching the previous
+    // `{ ...query, queryKey }` spread where it was set last.
+    if (key === "queryKey") continue;
+    Object.defineProperty(result, key, {
+      enumerable: true,
+      configurable: true,
+      get: () => (query as Record<string, unknown>)[key],
+    });
+  }
+  return result;
+};
+
 /**
  * Gets the details of the installed event stream, which includes its **protocol**, and **name**.
-
  * @summary Gets the details of the installed event stream
  */
 export const getEventStreamVersion = (
@@ -78,7 +92,7 @@ export const getGetEventStreamVersionQueryOptions = <
     Awaited<ReturnType<typeof getEventStreamVersion>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetEventStreamVersionQueryResult = NonNullable<
@@ -105,7 +119,7 @@ export function useGetEventStreamVersion<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetEventStreamVersion<
   TData = Awaited<ReturnType<typeof getEventStreamVersion>>,
   TError = ErrorType<void | AsError>,
@@ -125,7 +139,7 @@ export function useGetEventStreamVersion<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetEventStreamVersion<
   TData = Awaited<ReturnType<typeof getEventStreamVersion>>,
   TError = ErrorType<void | AsError>,
@@ -137,7 +151,7 @@ export function useGetEventStreamVersion<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the details of the installed event stream
  */
@@ -153,16 +167,14 @@ export function useGetEventStreamVersion<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetEventStreamVersionQueryOptions(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);
 }
 
 /**
@@ -197,7 +209,7 @@ export const getGetEventStreamVersionSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getEventStreamVersion>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetEventStreamVersionSuspenseQueryResult = NonNullable<
@@ -216,7 +228,7 @@ export function useGetEventStreamVersionSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetEventStreamVersionSuspense<
   TData = Awaited<ReturnType<typeof getEventStreamVersion>>,
   TError = ErrorType<void | AsError>,
@@ -228,7 +240,7 @@ export function useGetEventStreamVersionSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetEventStreamVersionSuspense<
   TData = Awaited<ReturnType<typeof getEventStreamVersion>>,
   TError = ErrorType<void | AsError>,
@@ -240,7 +252,7 @@ export function useGetEventStreamVersionSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the details of the installed event stream
  */
@@ -256,22 +268,19 @@ export function useGetEventStreamVersionSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetEventStreamVersionSuspenseQueryOptions(options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
  * Gets the details of your event stream, if you have created one. The response includes the event stream **id** and the **location** where events can be accessed.
-
  * @summary Gets the details of your event stream
  */
 export const getEventStream = (
@@ -306,7 +315,7 @@ export const getGetEventStreamQueryOptions = <
     Awaited<ReturnType<typeof getEventStream>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetEventStreamQueryResult = NonNullable<Awaited<ReturnType<typeof getEventStream>>>;
@@ -329,7 +338,7 @@ export function useGetEventStream<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetEventStream<
   TData = Awaited<ReturnType<typeof getEventStream>>,
   TError = ErrorType<void | AsError>,
@@ -347,7 +356,7 @@ export function useGetEventStream<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetEventStream<
   TData = Awaited<ReturnType<typeof getEventStream>>,
   TError = ErrorType<void | AsError>,
@@ -357,7 +366,7 @@ export function useGetEventStream<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the details of your event stream
  */
@@ -371,16 +380,14 @@ export function useGetEventStream<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetEventStreamQueryOptions(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);
 }
 
 /**
@@ -415,7 +422,7 @@ export const getGetEventStreamSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getEventStream>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetEventStreamSuspenseQueryResult = NonNullable<
@@ -434,7 +441,7 @@ export function useGetEventStreamSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetEventStreamSuspense<
   TData = Awaited<ReturnType<typeof getEventStream>>,
   TError = ErrorType<void | AsError>,
@@ -446,7 +453,7 @@ export function useGetEventStreamSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetEventStreamSuspense<
   TData = Awaited<ReturnType<typeof getEventStream>>,
   TError = ErrorType<void | AsError>,
@@ -458,7 +465,7 @@ export function useGetEventStreamSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the details of your event stream
  */
@@ -474,30 +481,27 @@ export function useGetEventStreamSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetEventStreamSuspenseQueryOptions(options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
  * Creates a new event stream for the authenticated user. Event streams deliver near-real-time events to the user, typically through a long-running *Socket*. The protocol is dependent on the Event Stream Service that has been installed. Our **Python FastAPI WebSocket** service is one such service.
-
-Events are delivered to the client using the a `format` chosen here. Internally, events are **Protocol Buffer** objects that are delivered, by default as a single-line string using `MessageToString`. This is the `PROTOCOL_STRING` format. Clients can choose to receive messages as a JSON string using the format `JSON_STRING`. Using JSON strings will incur a small processing penalty but they are useful if the client does not have access to a library that can decode protocol buffer strings.
-
-The response will include the event stream **id** and the **location** where events can be accessed.
-
-The event streaming service is an optional component of the Account Server. If a service is not installed you will receive a corresponding **404** error response.
-
-A user is only permitted one event stream.
-
+ *
+ * Events are delivered to the client using the a `format` chosen here. Internally, events are **Protocol Buffer** objects that are delivered, by default as a single-line string using `MessageToString`. This is the `PROTOCOL_STRING` format. Clients can choose to receive messages as a JSON string using the format `JSON_STRING`. Using JSON strings will incur a small processing penalty but they are useful if the client does not have access to a library that can decode protocol buffer strings.
+ *
+ * The response will include the event stream **id** and the **location** where events can be accessed.
+ *
+ * The event streaming service is an optional component of the Account Server. If a service is not installed you will receive a corresponding **404** error response.
+ *
+ * A user is only permitted one event stream.
  * @summary Create a new event stream
  */
 export const createEventStream = (
@@ -579,20 +583,21 @@ export const useCreateEventStream = <TError = ErrorType<AsError | void>, TContex
   { data: EventStreamPostBodyBody },
   TContext
 > => {
-  const mutationOptions = getCreateEventStreamMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getCreateEventStreamMutationOptions(options), queryClient);
 };
 /**
  * You must be the user who created the event stream.
-
  * @summary Deletes an existing event stream (that you created)
  */
 export const deleteEventStream = (
   eventStreamId: number,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<void>({ url: `/event-stream/${eventStreamId}`, method: "DELETE" }, options);
+  return customInstance<void>(
+    { url: `/event-stream/${eventStreamId}`, method: "DELETE", signal },
+    options,
+  );
 };
 
 export const getDeleteEventStreamMutationOptions = <
@@ -657,7 +662,5 @@ export const useDeleteEventStream = <TError = ErrorType<void | AsError>, TContex
   { eventStreamId: number },
   TContext
 > => {
-  const mutationOptions = getDeleteEventStreamMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getDeleteEventStreamMutationOptions(options), queryClient);
 };

package/src/api/merchant/merchant.fetch.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,20 +24,28 @@ import type {
   UseSuspenseQueryResult,
 } from "@tanstack/react-query";
 
-import type { AsError, MerchantDetail, MerchantsGetResponse } from ".././api-schemas";
+import type { AsError, MerchantDetail, MerchantsGetResponse } from "../api-schemas";
 
 import { customFetch } from "../../custom-fetch";
 import type { ErrorType } from "../../custom-fetch";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
-/**
- * Gets Merchants known to the Account Server
-
-Merchants are software services (SaaS assets) whose facilities are known to and controlled by the Account Server
+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;
+};
 
- * @summary Gets all Merchants
- */
 export type getMerchantsResponse200 = { data: MerchantsGetResponse; status: 200 };
 
 export type getMerchantsResponse400 = { data: AsError; status: 400 };
@@ -59,6 +67,12 @@ export const getGetMerchantsUrl = () => {
   return `/merchant`;
 };
 
+/**
+ * Gets Merchants known to 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 = async (options?: RequestInit): Promise<getMerchantsResponse> => {
   return customFetch<getMerchantsResponse>(getGetMerchantsUrl(), { ...options, method: "GET" });
 };
@@ -85,7 +99,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>>>;
@@ -108,7 +122,7 @@ export function useGetMerchants<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -126,7 +140,7 @@ export function useGetMerchants<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -136,7 +150,7 @@ export function useGetMerchants<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Merchants
  */
@@ -150,16 +164,14 @@ export function useGetMerchants<
     request?: SecondParameter<typeof customFetch>;
   },
   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);
 }
 
 /**
@@ -192,7 +204,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>>>;
@@ -209,7 +221,7 @@ export function useGetMerchantsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -221,7 +233,7 @@ export function useGetMerchantsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -233,7 +245,7 @@ export function useGetMerchantsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all Merchants
  */
@@ -249,24 +261,17 @@ export function useGetMerchantsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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 type getServiceResponse200 = { data: MerchantDetail; status: 200 };
 
 export type getServiceResponse400 = { data: AsError; status: 400 };
@@ -288,6 +293,10 @@ export const getGetServiceUrl = (mId: number) => {
   return `/merchant/${mId}`;
 };
 
+/**
+ * Gets a known Merchant
+ * @summary Gets a specific Merchant
+ */
 export const getService = async (
   mId: number,
   options?: RequestInit,
@@ -295,7 +304,7 @@ export const getService = async (
   return customFetch<getServiceResponse>(getGetServiceUrl(mId), { ...options, method: "GET" });
 };
 
-export const getGetServiceQueryKey = (mId?: number) => {
+export const getGetServiceQueryKey = (mId: number) => {
   return ["account-server", "merchant", mId] as const;
 };
 
@@ -316,11 +325,14 @@ export const getGetServiceQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getService>>> = ({ signal }) =>
     getService(mId, { signal, ...requestOptions });
 
-  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>>>;
@@ -344,7 +356,7 @@ export function useGetService<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -363,7 +375,7 @@ export function useGetService<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -374,7 +386,7 @@ export function useGetService<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets a specific Merchant
  */
@@ -389,16 +401,14 @@ export function useGetService<
     request?: SecondParameter<typeof customFetch>;
   },
   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);
 }
 
 /**
@@ -435,7 +445,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>>>;
@@ -451,7 +461,7 @@ export function useGetServiceSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -462,7 +472,7 @@ export function useGetServiceSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -473,7 +483,7 @@ export function useGetServiceSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets a specific Merchant
  */
@@ -488,15 +498,13 @@ export function useGetServiceSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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);
 }