@squonk/data-manager-client 5.4.0-alpha.3 → 6.1.0

package/src/api/configuration/configuration.fetch.ts

@@ -1,12 +1,12 @@
 /**
- * Generated by orval v7.21.0 🍺
+ * Generated by orval v8.16.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
-
-A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
-
- * OpenAPI spec version: 5.4
+ *
+ * A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
+ *
+ * OpenAPI spec version: 6.1
  */
 import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
@@ -24,16 +24,13 @@ import type {
   UseSuspenseQueryResult,
 } from "@tanstack/react-query";
 
-import type { DmError, InputHandlerGetResponse, ModeGetResponse } from ".././api-schemas";
+import type { DmError, InputHandlerGetResponse, ModeGetResponse } from "../api-schemas";
 
 import { customFetch } from "../../custom-fetch";
 import type { ErrorType } from "../../custom-fetch";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
-/**
- * @summary Gets the Data Manager API mode
- */
 export type getModeResponse200 = { data: ModeGetResponse; status: 200 };
 
 export type getModeResponse401 = { data: void; status: 401 };
@@ -49,6 +46,9 @@ export const getGetModeUrl = () => {
   return `/mode`;
 };
 
+/**
+ * @summary Gets the Data Manager API mode
+ */
 export const getMode = async (options?: RequestInit): Promise<getModeResponse> => {
   return customFetch<getModeResponse>(getGetModeUrl(), { ...options, method: "GET" });
 };
@@ -75,7 +75,7 @@ export const getGetModeQueryOptions = <
     Awaited<ReturnType<typeof getMode>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetModeQueryResult = NonNullable<Awaited<ReturnType<typeof getMode>>>;
@@ -98,7 +98,7 @@ export function useGetMode<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetMode<
   TData = Awaited<ReturnType<typeof getMode>>,
   TError = ErrorType<void | DmError>,
@@ -116,7 +116,7 @@ export function useGetMode<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetMode<
   TData = Awaited<ReturnType<typeof getMode>>,
   TError = ErrorType<void | DmError>,
@@ -126,7 +126,7 @@ export function useGetMode<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the Data Manager API mode
  */
@@ -140,16 +140,14 @@ export function useGetMode<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetModeQueryOptions(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 { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -182,7 +180,7 @@ export const getGetModeSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getMode>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetModeSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getMode>>>;
@@ -197,7 +195,7 @@ export function useGetModeSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetModeSuspense<
   TData = Awaited<ReturnType<typeof getMode>>,
   TError = ErrorType<void | DmError>,
@@ -207,7 +205,7 @@ export function useGetModeSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetModeSuspense<
   TData = Awaited<ReturnType<typeof getMode>>,
   TError = ErrorType<void | DmError>,
@@ -217,7 +215,7 @@ export function useGetModeSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the Data Manager API mode
  */
@@ -231,22 +229,17 @@ export function useGetModeSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetModeSuspenseQueryOptions(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 { ...query, queryKey: queryOptions.queryKey };
 }
 
-/**
- * @summary Get information about all Input Handlers that are available.
- */
 export type getInputHandlersResponse200 = { data: InputHandlerGetResponse; status: 200 };
 
 export type getInputHandlersResponse401 = { data: void; status: 401 };
@@ -267,6 +260,9 @@ export const getGetInputHandlersUrl = () => {
   return `/input-handler`;
 };
 
+/**
+ * @summary Get information about all Input Handlers that are available.
+ */
 export const getInputHandlers = async (
   options?: RequestInit,
 ): Promise<getInputHandlersResponse> => {
@@ -298,7 +294,7 @@ export const getGetInputHandlersQueryOptions = <
     Awaited<ReturnType<typeof getInputHandlers>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetInputHandlersQueryResult = NonNullable<Awaited<ReturnType<typeof getInputHandlers>>>;
@@ -321,7 +317,7 @@ export function useGetInputHandlers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInputHandlers<
   TData = Awaited<ReturnType<typeof getInputHandlers>>,
   TError = ErrorType<void | DmError>,
@@ -339,7 +335,7 @@ export function useGetInputHandlers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInputHandlers<
   TData = Awaited<ReturnType<typeof getInputHandlers>>,
   TError = ErrorType<void | DmError>,
@@ -349,7 +345,7 @@ export function useGetInputHandlers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get information about all Input Handlers that are available.
  */
@@ -363,16 +359,14 @@ export function useGetInputHandlers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetInputHandlersQueryOptions(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 { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -407,7 +401,7 @@ export const getGetInputHandlersSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getInputHandlers>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetInputHandlersSuspenseQueryResult = NonNullable<
@@ -426,7 +420,7 @@ export function useGetInputHandlersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInputHandlersSuspense<
   TData = Awaited<ReturnType<typeof getInputHandlers>>,
   TError = ErrorType<void | DmError>,
@@ -438,7 +432,7 @@ export function useGetInputHandlersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInputHandlersSuspense<
   TData = Awaited<ReturnType<typeof getInputHandlers>>,
   TError = ErrorType<void | DmError>,
@@ -450,7 +444,7 @@ export function useGetInputHandlersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get information about all Input Handlers that are available.
  */
@@ -466,15 +460,13 @@ export function useGetInputHandlersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetInputHandlersSuspenseQueryOptions(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 { ...query, queryKey: queryOptions.queryKey };
 }

package/src/api/configuration/configuration.ts

@@ -1,12 +1,12 @@
 /**
- * Generated by orval v7.21.0 🍺
+ * Generated by orval v8.16.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
-
-A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
-
- * OpenAPI spec version: 5.4
+ *
+ * A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
+ *
+ * OpenAPI spec version: 6.1
  */
 import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
@@ -24,7 +24,7 @@ import type {
   UseSuspenseQueryResult,
 } from "@tanstack/react-query";
 
-import type { DmError, InputHandlerGetResponse, ModeGetResponse } from ".././api-schemas";
+import type { DmError, InputHandlerGetResponse, ModeGetResponse } from "../api-schemas";
 
 import { customInstance } from "../../custom-axios";
 import type { ErrorType } from "../../custom-axios";
@@ -60,7 +60,7 @@ export const getGetModeQueryOptions = <
     Awaited<ReturnType<typeof getMode>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetModeQueryResult = NonNullable<Awaited<ReturnType<typeof getMode>>>;
@@ -83,7 +83,7 @@ export function useGetMode<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetMode<
   TData = Awaited<ReturnType<typeof getMode>>,
   TError = ErrorType<void | DmError>,
@@ -101,7 +101,7 @@ export function useGetMode<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetMode<
   TData = Awaited<ReturnType<typeof getMode>>,
   TError = ErrorType<void | DmError>,
@@ -111,7 +111,7 @@ export function useGetMode<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the Data Manager API mode
  */
@@ -125,16 +125,14 @@ export function useGetMode<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetModeQueryOptions(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 { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -167,7 +165,7 @@ export const getGetModeSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getMode>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetModeSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getMode>>>;
@@ -182,7 +180,7 @@ export function useGetModeSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetModeSuspense<
   TData = Awaited<ReturnType<typeof getMode>>,
   TError = ErrorType<void | DmError>,
@@ -192,7 +190,7 @@ export function useGetModeSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetModeSuspense<
   TData = Awaited<ReturnType<typeof getMode>>,
   TError = ErrorType<void | DmError>,
@@ -202,7 +200,7 @@ export function useGetModeSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the Data Manager API mode
  */
@@ -216,17 +214,15 @@ export function useGetModeSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetModeSuspenseQueryOptions(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 { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -264,7 +260,7 @@ export const getGetInputHandlersQueryOptions = <
     Awaited<ReturnType<typeof getInputHandlers>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetInputHandlersQueryResult = NonNullable<Awaited<ReturnType<typeof getInputHandlers>>>;
@@ -287,7 +283,7 @@ export function useGetInputHandlers<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInputHandlers<
   TData = Awaited<ReturnType<typeof getInputHandlers>>,
   TError = ErrorType<void | DmError>,
@@ -305,7 +301,7 @@ export function useGetInputHandlers<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInputHandlers<
   TData = Awaited<ReturnType<typeof getInputHandlers>>,
   TError = ErrorType<void | DmError>,
@@ -315,7 +311,7 @@ export function useGetInputHandlers<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get information about all Input Handlers that are available.
  */
@@ -329,16 +325,14 @@ export function useGetInputHandlers<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetInputHandlersQueryOptions(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 { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -373,7 +367,7 @@ export const getGetInputHandlersSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getInputHandlers>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetInputHandlersSuspenseQueryResult = NonNullable<
@@ -392,7 +386,7 @@ export function useGetInputHandlersSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInputHandlersSuspense<
   TData = Awaited<ReturnType<typeof getInputHandlers>>,
   TError = ErrorType<void | DmError>,
@@ -404,7 +398,7 @@ export function useGetInputHandlersSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInputHandlersSuspense<
   TData = Awaited<ReturnType<typeof getInputHandlers>>,
   TError = ErrorType<void | DmError>,
@@ -416,7 +410,7 @@ export function useGetInputHandlersSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get information about all Input Handlers that are available.
  */
@@ -432,15 +426,13 @@ export function useGetInputHandlersSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetInputHandlersSuspenseQueryOptions(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 { ...query, queryKey: queryOptions.queryKey };
 }