@squonk/data-manager-client 5.4.0 → 6.2.0

package/src/api/instance/instance.ts

@@ -1,26 +1,23 @@
 /**
- * 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.2
  */
-import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
+import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
   DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   InvalidateOptions,
-  MutationFunction,
   QueryClient,
   QueryFunction,
   QueryKey,
   UndefinedInitialDataOptions,
-  UseMutationOptions,
-  UseMutationResult,
   UseQueryOptions,
   UseQueryResult,
   UseSuspenseQueryOptions,
@@ -37,7 +34,7 @@ import type {
   InstancesGetResponse,
   PatchInstanceParams,
   TaskIdentity,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customInstance } from "../../custom-axios";
 import type { ErrorType } from "../../custom-axios";
@@ -46,13 +43,12 @@ type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
 /**
  * Launches a new Application or Job instance, returning an Instance and Task ID. The Task ID should be used against the `/task` endpoint to determine the availability of the the running instance.
-
-Instance behaviour is controlled using the `specification`. You will need to consult individual applications to determine what can be placed in the specification. Applications typically provide a `template` describing its **options**.
-
-An Application instance is not Ready for use until the corresponding **TaskState** is _STARTED_.
-
-A Job instance typically runs to completion, reaching the **TaskState** _SUCCESS_ when successful and _FAILURE_ is unsuccessful.
-
+ *
+ * Instance behaviour is controlled using the `specification`. You will need to consult individual applications to determine what can be placed in the specification. Applications typically provide a `template` describing its **options**.
+ *
+ * An Application instance is not Ready for use until the corresponding **TaskState** is _STARTED_.
+ *
+ * A Job instance typically runs to completion, reaching the **TaskState** _SUCCESS_ when successful and _FAILURE_ is unsuccessful.
  * @summary Creates a new Job or Application instance
  */
 export const createInstance = (
@@ -98,75 +94,130 @@ export const createInstance = (
   );
 };
 
-export const getCreateInstanceMutationOptions = <
+export const getCreateInstanceQueryKey = (instancePostBodyBody?: InstancePostBodyBody) => {
+  return ["data-manager", "POST", "instance", instancePostBodyBody] as const;
+};
+
+export const getCreateInstanceQueryOptions = <
+  TData = Awaited<ReturnType<typeof createInstance>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createInstance>>,
-    TError,
-    { data: InstancePostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createInstance>>,
-  TError,
-  { data: InstancePostBodyBody },
-  TContext
-> => {
-  const mutationKey = ["createInstance"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createInstance>>,
-    { data: InstancePostBodyBody }
-  > = (props) => {
-    const { data } = props ?? {};
+>(
+  instancePostBodyBody: InstancePostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return createInstance(data, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getCreateInstanceQueryKey(instancePostBodyBody);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof createInstance>>> = ({ signal }) =>
+    createInstance(instancePostBodyBody, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof createInstance>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type CreateInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof createInstance>>>;
-export type CreateInstanceMutationBody = InstancePostBodyBody;
-export type CreateInstanceMutationError = ErrorType<void | DmError>;
+export type CreateInstanceQueryResult = NonNullable<Awaited<ReturnType<typeof createInstance>>>;
+export type CreateInstanceQueryError = ErrorType<void | DmError>;
 
+export function useCreateInstance<
+  TData = Awaited<ReturnType<typeof createInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instancePostBodyBody: InstancePostBodyBody,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof createInstance>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof createInstance>>,
+          TError,
+          Awaited<ReturnType<typeof createInstance>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useCreateInstance<
+  TData = Awaited<ReturnType<typeof createInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instancePostBodyBody: InstancePostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createInstance>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof createInstance>>,
+          TError,
+          Awaited<ReturnType<typeof createInstance>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useCreateInstance<
+  TData = Awaited<ReturnType<typeof createInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instancePostBodyBody: InstancePostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Creates a new Job or Application instance
  */
-export const useCreateInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useCreateInstance<
+  TData = Awaited<ReturnType<typeof createInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instancePostBodyBody: InstancePostBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createInstance>>,
-      TError,
-      { data: InstancePostBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createInstance>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createInstance>>,
-  TError,
-  { data: InstancePostBodyBody },
-  TContext
-> => {
-  const mutationOptions = getCreateInstanceMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getCreateInstanceQueryOptions(instancePostBodyBody, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-  return useMutation(mutationOptions, queryClient);
-};
 /**
- * Returns a summary of all running instances. Instances can be running as an Application or as a Job. The response will contain an `application_type` field that is either `job` or `application`
+ * @summary Creates a new Job or Application instance
+ */
+export const invalidateCreateInstance = async (
+  queryClient: QueryClient,
+  instancePostBodyBody: InstancePostBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getCreateInstanceQueryKey(instancePostBodyBody) },
+    options,
+  );
 
-Results can be filtered by **Project**, **Unit** or **Organisation**.
+  return queryClient;
+};
 
+/**
+ * Returns a summary of all running instances. Instances can be running as an Application or as a Job. The response will contain an `application_type` field that is either `job` or `application`
+ *
+ * Results can be filtered by **Project**, **Unit** or **Organisation**.
  * @summary Get summary information about all Job and Application instances
  */
 export const getInstances = (
@@ -205,7 +256,7 @@ export const getGetInstancesQueryOptions = <
     Awaited<ReturnType<typeof getInstances>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetInstancesQueryResult = NonNullable<Awaited<ReturnType<typeof getInstances>>>;
@@ -229,7 +280,7 @@ export function useGetInstances<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInstances<
   TData = Awaited<ReturnType<typeof getInstances>>,
   TError = ErrorType<void | DmError>,
@@ -248,7 +299,7 @@ export function useGetInstances<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInstances<
   TData = Awaited<ReturnType<typeof getInstances>>,
   TError = ErrorType<void | DmError>,
@@ -259,7 +310,7 @@ export function useGetInstances<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get summary information about all Job and Application instances
  */
@@ -274,16 +325,14 @@ export function useGetInstances<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetInstancesQueryOptions(params, 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 };
 }
 
 /**
@@ -322,7 +371,7 @@ export const getGetInstancesSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getInstances>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetInstancesSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getInstances>>>;
@@ -340,7 +389,7 @@ export function useGetInstancesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInstancesSuspense<
   TData = Awaited<ReturnType<typeof getInstances>>,
   TError = ErrorType<void | DmError>,
@@ -353,7 +402,7 @@ export function useGetInstancesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInstancesSuspense<
   TData = Awaited<ReturnType<typeof getInstances>>,
   TError = ErrorType<void | DmError>,
@@ -366,7 +415,7 @@ export function useGetInstancesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get summary information about all Job and Application instances
  */
@@ -383,24 +432,21 @@ export function useGetInstancesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetInstancesSuspenseQueryOptions(params, 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 };
 }
 
 /**
  * Similar to the `/instance [POST]` endpoint this one is used to check whether a new **Application** or **Job** instance can be launched. Rather than returning an **Instance** (or **Task**) ID this endpoint is simply used to ensure that the Job/Application is runnable while also returning the compiled `command` (if the Instance is a Job).
-
-The test result is only valid at the time of the call, whether an actual instance would start or not will require an identical call to `/instance POST`.
-
+ *
+ * The test result is only valid at the time of the call, whether an actual instance would start or not will require an identical call to `/instance POST`.
  * @summary Used to check the execution of new Job or Application instance
  */
 export const dryRunInstance = (
@@ -446,70 +492,126 @@ export const dryRunInstance = (
   );
 };
 
-export const getDryRunInstanceMutationOptions = <
+export const getDryRunInstanceQueryKey = (instancePostBodyBody?: InstancePostBodyBody) => {
+  return ["data-manager", "POST", "instance", "dry-run", instancePostBodyBody] as const;
+};
+
+export const getDryRunInstanceQueryOptions = <
+  TData = Awaited<ReturnType<typeof dryRunInstance>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof dryRunInstance>>,
-    TError,
-    { data: InstancePostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof dryRunInstance>>,
-  TError,
-  { data: InstancePostBodyBody },
-  TContext
-> => {
-  const mutationKey = ["dryRunInstance"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof dryRunInstance>>,
-    { data: InstancePostBodyBody }
-  > = (props) => {
-    const { data } = props ?? {};
+>(
+  instancePostBodyBody: InstancePostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof dryRunInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return dryRunInstance(data, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getDryRunInstanceQueryKey(instancePostBodyBody);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof dryRunInstance>>> = ({ signal }) =>
+    dryRunInstance(instancePostBodyBody, requestOptions, signal);
+
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof dryRunInstance>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type DryRunInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof dryRunInstance>>>;
-export type DryRunInstanceMutationBody = InstancePostBodyBody;
-export type DryRunInstanceMutationError = ErrorType<void | DmError>;
+export type DryRunInstanceQueryResult = NonNullable<Awaited<ReturnType<typeof dryRunInstance>>>;
+export type DryRunInstanceQueryError = ErrorType<void | DmError>;
 
+export function useDryRunInstance<
+  TData = Awaited<ReturnType<typeof dryRunInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instancePostBodyBody: InstancePostBodyBody,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof dryRunInstance>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof dryRunInstance>>,
+          TError,
+          Awaited<ReturnType<typeof dryRunInstance>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDryRunInstance<
+  TData = Awaited<ReturnType<typeof dryRunInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instancePostBodyBody: InstancePostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof dryRunInstance>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof dryRunInstance>>,
+          TError,
+          Awaited<ReturnType<typeof dryRunInstance>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDryRunInstance<
+  TData = Awaited<ReturnType<typeof dryRunInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instancePostBodyBody: InstancePostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof dryRunInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Used to check the execution of new Job or Application instance
  */
-export const useDryRunInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useDryRunInstance<
+  TData = Awaited<ReturnType<typeof dryRunInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instancePostBodyBody: InstancePostBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof dryRunInstance>>,
-      TError,
-      { data: InstancePostBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof dryRunInstance>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof dryRunInstance>>,
-  TError,
-  { data: InstancePostBodyBody },
-  TContext
-> => {
-  const mutationOptions = getDryRunInstanceMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getDryRunInstanceQueryOptions(instancePostBodyBody, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-  return useMutation(mutationOptions, queryClient);
+/**
+ * @summary Used to check the execution of new Job or Application instance
+ */
+export const invalidateDryRunInstance = async (
+  queryClient: QueryClient,
+  instancePostBodyBody: InstancePostBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getDryRunInstanceQueryKey(instancePostBodyBody) },
+    options,
+  );
+
+  return queryClient;
 };
+
 /**
  * @summary Get detailed information about an Instance
  */
@@ -524,7 +626,7 @@ export const getInstance = (
   );
 };
 
-export const getGetInstanceQueryKey = (instanceId?: string) => {
+export const getGetInstanceQueryKey = (instanceId: string) => {
   return ["data-manager", "instance", instanceId] as const;
 };
 
@@ -545,11 +647,14 @@ export const getGetInstanceQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getInstance>>> = ({ signal }) =>
     getInstance(instanceId, requestOptions, signal);
 
-  return { queryKey, queryFn, enabled: !!instanceId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getInstance>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: instanceId !== null && instanceId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getInstance>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetInstanceQueryResult = NonNullable<Awaited<ReturnType<typeof getInstance>>>;
@@ -573,7 +678,7 @@ export function useGetInstance<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInstance<
   TData = Awaited<ReturnType<typeof getInstance>>,
   TError = ErrorType<void | DmError>,
@@ -592,7 +697,7 @@ export function useGetInstance<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInstance<
   TData = Awaited<ReturnType<typeof getInstance>>,
   TError = ErrorType<void | DmError>,
@@ -603,7 +708,7 @@ export function useGetInstance<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get detailed information about an Instance
  */
@@ -618,16 +723,14 @@ export function useGetInstance<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetInstanceQueryOptions(instanceId, 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 };
 }
 
 /**
@@ -666,7 +769,7 @@ export const getGetInstanceSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getInstance>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetInstanceSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getInstance>>>;
@@ -682,7 +785,7 @@ export function useGetInstanceSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInstanceSuspense<
   TData = Awaited<ReturnType<typeof getInstance>>,
   TError = ErrorType<void | DmError>,
@@ -695,7 +798,7 @@ export function useGetInstanceSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetInstanceSuspense<
   TData = Awaited<ReturnType<typeof getInstance>>,
   TError = ErrorType<void | DmError>,
@@ -708,7 +811,7 @@ export function useGetInstanceSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get detailed information about an Instance
  */
@@ -725,264 +828,464 @@ export function useGetInstanceSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetInstanceSuspenseQueryOptions(instanceId, 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 };
 }
 
 /**
  * The Application or Job Instance is terminated.
-
-You must be the `owner` or an `editor` of the Instance to delete it
-
+ *
+ * You must be the `owner` or an `editor` of the Instance to delete it
  * @summary Delete a Job or Application Instance
  */
 export const terminateInstance = (
   instanceId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<TaskIdentity>(
-    { url: `/instance/${instanceId}`, method: "DELETE" },
+    { url: `/instance/${instanceId}`, method: "DELETE", signal },
     options,
   );
 };
 
-export const getTerminateInstanceMutationOptions = <
+export const getTerminateInstanceQueryKey = (instanceId: string) => {
+  return ["data-manager", "DELETE", "instance", instanceId] as const;
+};
+
+export const getTerminateInstanceQueryOptions = <
+  TData = Awaited<ReturnType<typeof terminateInstance>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof terminateInstance>>,
-    TError,
-    { instanceId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof terminateInstance>>,
-  TError,
-  { instanceId: string },
-  TContext
-> => {
-  const mutationKey = ["terminateInstance"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof terminateInstance>>,
-    { instanceId: string }
-  > = (props) => {
-    const { instanceId } = props ?? {};
-
-    return terminateInstance(instanceId, requestOptions);
-  };
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof terminateInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getTerminateInstanceQueryKey(instanceId);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof terminateInstance>>> = ({ signal }) =>
+    terminateInstance(instanceId, requestOptions, signal);
+
+  return {
+    queryKey,
+    queryFn,
+    enabled: instanceId !== null && instanceId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof terminateInstance>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type TerminateInstanceMutationResult = NonNullable<
+export type TerminateInstanceQueryResult = NonNullable<
   Awaited<ReturnType<typeof terminateInstance>>
 >;
+export type TerminateInstanceQueryError = ErrorType<void | DmError>;
 
-export type TerminateInstanceMutationError = ErrorType<void | DmError>;
-
+export function useTerminateInstance<
+  TData = Awaited<ReturnType<typeof terminateInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof terminateInstance>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof terminateInstance>>,
+          TError,
+          Awaited<ReturnType<typeof terminateInstance>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useTerminateInstance<
+  TData = Awaited<ReturnType<typeof terminateInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof terminateInstance>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof terminateInstance>>,
+          TError,
+          Awaited<ReturnType<typeof terminateInstance>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useTerminateInstance<
+  TData = Awaited<ReturnType<typeof terminateInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof terminateInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Job or Application Instance
  */
-export const useTerminateInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useTerminateInstance<
+  TData = Awaited<ReturnType<typeof terminateInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof terminateInstance>>,
-      TError,
-      { instanceId: string },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof terminateInstance>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof terminateInstance>>,
-  TError,
-  { instanceId: string },
-  TContext
-> => {
-  const mutationOptions = getTerminateInstanceMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getTerminateInstanceQueryOptions(instanceId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-  return useMutation(mutationOptions, queryClient);
-};
 /**
- * The Application or Job Instance is updated according to the patch parameters.
+ * @summary Delete a Job or Application Instance
+ */
+export const invalidateTerminateInstance = async (
+  queryClient: QueryClient,
+  instanceId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getTerminateInstanceQueryKey(instanceId) },
+    options,
+  );
 
-You must be the `owner` or an `editor` of the Instance to patch it
+  return queryClient;
+};
 
+/**
+ * The Application or Job Instance is updated according to the patch parameters.
+ *
+ * You must be the `owner` or an `editor` of the Instance to patch it
  * @summary Update a Job or Application Instance
  */
 export const patchInstance = (
   instanceId: string,
   params?: PatchInstanceParams,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<void>({ url: `/instance/${instanceId}`, method: "PATCH", params }, options);
+  return customInstance<void>(
+    { url: `/instance/${instanceId}`, method: "PATCH", params, signal },
+    options,
+  );
+};
+
+export const getPatchInstanceQueryKey = (instanceId: string, params?: PatchInstanceParams) => {
+  return ["data-manager", "PATCH", "instance", instanceId, ...(params ? [params] : [])] as const;
 };
 
-export const getPatchInstanceMutationOptions = <
+export const getPatchInstanceQueryOptions = <
+  TData = Awaited<ReturnType<typeof patchInstance>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof patchInstance>>,
-    TError,
-    { instanceId: string; params?: PatchInstanceParams },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof patchInstance>>,
-  TError,
-  { instanceId: string; params?: PatchInstanceParams },
-  TContext
-> => {
-  const mutationKey = ["patchInstance"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof patchInstance>>,
-    { instanceId: string; params?: PatchInstanceParams }
-  > = (props) => {
-    const { instanceId, params } = props ?? {};
-
-    return patchInstance(instanceId, params, requestOptions);
-  };
+>(
+  instanceId: string,
+  params?: PatchInstanceParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
-};
+  const queryKey = queryOptions?.queryKey ?? getPatchInstanceQueryKey(instanceId, params);
 
-export type PatchInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof patchInstance>>>;
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof patchInstance>>> = ({ signal }) =>
+    patchInstance(instanceId, params, requestOptions, signal);
 
-export type PatchInstanceMutationError = ErrorType<void | DmError>;
+  return {
+    queryKey,
+    queryFn,
+    enabled: instanceId !== null && instanceId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof patchInstance>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+};
+
+export type PatchInstanceQueryResult = NonNullable<Awaited<ReturnType<typeof patchInstance>>>;
+export type PatchInstanceQueryError = ErrorType<void | DmError>;
 
+export function usePatchInstance<
+  TData = Awaited<ReturnType<typeof patchInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  params: undefined | PatchInstanceParams,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchInstance>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof patchInstance>>,
+          TError,
+          Awaited<ReturnType<typeof patchInstance>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function usePatchInstance<
+  TData = Awaited<ReturnType<typeof patchInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  params?: PatchInstanceParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchInstance>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof patchInstance>>,
+          TError,
+          Awaited<ReturnType<typeof patchInstance>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function usePatchInstance<
+  TData = Awaited<ReturnType<typeof patchInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  params?: PatchInstanceParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchInstance>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Update a Job or Application Instance
  */
-export const usePatchInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function usePatchInstance<
+  TData = Awaited<ReturnType<typeof patchInstance>>,
+  TError = ErrorType<void | DmError>,
+>(
+  instanceId: string,
+  params?: PatchInstanceParams,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof patchInstance>>,
-      TError,
-      { instanceId: string; params?: PatchInstanceParams },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchInstance>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof patchInstance>>,
-  TError,
-  { instanceId: string; params?: PatchInstanceParams },
-  TContext
-> => {
-  const mutationOptions = getPatchInstanceMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getPatchInstanceQueryOptions(instanceId, params, options);
 
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * This revokes the instance **Token**, which was optionally generated when the instance was launched. No authentication is required to use this endpoint, which is typically used by a remote system driven by instance callbacks.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-Tokens automatically expire after a period of time but can be revoked instantly with this endpoint.
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-The remote system will revoke the token when it's finished with it
+/**
+ * @summary Update a Job or Application Instance
+ */
+export const invalidatePatchInstance = async (
+  queryClient: QueryClient,
+  instanceId: string,
+  params?: PatchInstanceParams,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getPatchInstanceQueryKey(instanceId, params) },
+    options,
+  );
 
+  return queryClient;
+};
+
+/**
+ * This revokes the instance **Token**, which was optionally generated when the instance was launched. No authentication is required to use this endpoint, which is typically used by a remote system driven by instance callbacks.
+ *
+ * Tokens automatically expire after a period of time but can be revoked instantly with this endpoint.
+ *
+ * The remote system will revoke the token when it's finished with it
  * @summary Delete (revoke) the Instance Token
  */
 export const deleteInstanceToken = (
   instanceId: string,
   token: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
-    { url: `/instance/${instanceId}/token/${token}`, method: "DELETE" },
+    { url: `/instance/${instanceId}/token/${token}`, method: "DELETE", signal },
     options,
   );
 };
 
-export const getDeleteInstanceTokenMutationOptions = <
+export const getDeleteInstanceTokenQueryKey = (instanceId: string, token: string) => {
+  return ["data-manager", "DELETE", "instance", instanceId, "token", token] as const;
+};
+
+export const getDeleteInstanceTokenQueryOptions = <
+  TData = Awaited<ReturnType<typeof deleteInstanceToken>>,
   TError = ErrorType<DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteInstanceToken>>,
-    TError,
-    { instanceId: string; token: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteInstanceToken>>,
-  TError,
-  { instanceId: string; token: string },
-  TContext
-> => {
-  const mutationKey = ["deleteInstanceToken"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteInstanceToken>>,
-    { instanceId: string; token: string }
-  > = (props) => {
-    const { instanceId, token } = props ?? {};
-
-    return deleteInstanceToken(instanceId, token, requestOptions);
-  };
+>(
+  instanceId: string,
+  token: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteInstanceToken>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getDeleteInstanceTokenQueryKey(instanceId, token);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteInstanceToken>>> = ({ signal }) =>
+    deleteInstanceToken(instanceId, token, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return {
+    queryKey,
+    queryFn,
+    enabled:
+      instanceId !== null && instanceId !== undefined && token !== null && token !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof deleteInstanceToken>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type DeleteInstanceTokenMutationResult = NonNullable<
+export type DeleteInstanceTokenQueryResult = NonNullable<
   Awaited<ReturnType<typeof deleteInstanceToken>>
 >;
+export type DeleteInstanceTokenQueryError = ErrorType<DmError>;
 
-export type DeleteInstanceTokenMutationError = ErrorType<DmError>;
-
+export function useDeleteInstanceToken<
+  TData = Awaited<ReturnType<typeof deleteInstanceToken>>,
+  TError = ErrorType<DmError>,
+>(
+  instanceId: string,
+  token: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteInstanceToken>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof deleteInstanceToken>>,
+          TError,
+          Awaited<ReturnType<typeof deleteInstanceToken>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDeleteInstanceToken<
+  TData = Awaited<ReturnType<typeof deleteInstanceToken>>,
+  TError = ErrorType<DmError>,
+>(
+  instanceId: string,
+  token: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteInstanceToken>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof deleteInstanceToken>>,
+          TError,
+          Awaited<ReturnType<typeof deleteInstanceToken>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDeleteInstanceToken<
+  TData = Awaited<ReturnType<typeof deleteInstanceToken>>,
+  TError = ErrorType<DmError>,
+>(
+  instanceId: string,
+  token: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteInstanceToken>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete (revoke) the Instance Token
  */
-export const useDeleteInstanceToken = <TError = ErrorType<DmError>, TContext = unknown>(
+
+export function useDeleteInstanceToken<
+  TData = Awaited<ReturnType<typeof deleteInstanceToken>>,
+  TError = ErrorType<DmError>,
+>(
+  instanceId: string,
+  token: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteInstanceToken>>,
-      TError,
-      { instanceId: string; token: string },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteInstanceToken>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteInstanceToken>>,
-  TError,
-  { instanceId: string; token: string },
-  TContext
-> => {
-  const mutationOptions = getDeleteInstanceTokenMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getDeleteInstanceTokenQueryOptions(instanceId, token, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-  return useMutation(mutationOptions, queryClient);
+/**
+ * @summary Delete (revoke) the Instance Token
+ */
+export const invalidateDeleteInstanceToken = async (
+  queryClient: QueryClient,
+  instanceId: string,
+  token: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getDeleteInstanceTokenQueryKey(instanceId, token) },
+    options,
+  );
+
+  return queryClient;
 };