@squonk/data-manager-client 6.7.1 → 6.7.2

package/src/api/instance/instance.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v8.16.0 🍺
+ * Generated by orval v8.22.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
@@ -8,16 +8,19 @@
  *
  * OpenAPI spec version: 6.7
  */
-import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
+import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
   DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   InvalidateOptions,
+  MutationFunction,
   QueryClient,
   QueryFunction,
   QueryKey,
   UndefinedInitialDataOptions,
+  UseMutationOptions,
+  UseMutationResult,
   UseQueryOptions,
   UseQueryResult,
   UseSuspenseQueryOptions,
@@ -41,6 +44,21 @@ 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;
+};
+
 /**
  * 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.
  *
@@ -94,126 +112,68 @@ export const createInstance = (
   );
 };
 
-export const getCreateInstanceQueryKey = (instancePostBodyBody?: InstancePostBodyBody) => {
-  return ["data-manager", "POST", "instance", instancePostBodyBody] as const;
-};
-
-export const getCreateInstanceQueryOptions = <
-  TData = Awaited<ReturnType<typeof createInstance>>,
+export const getCreateInstanceMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  instancePostBodyBody: InstancePostBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createInstance>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getCreateInstanceQueryKey(instancePostBodyBody);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof createInstance>>> = ({ signal }) =>
-    createInstance(instancePostBodyBody, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof createInstance>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, 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 ?? {};
+
+    return createInstance(data, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type CreateInstanceQueryResult = NonNullable<Awaited<ReturnType<typeof createInstance>>>;
-export type CreateInstanceQueryError = ErrorType<void | DmError>;
+export type CreateInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof createInstance>>>;
+export type CreateInstanceMutationBody = InstancePostBodyBody;
+export type CreateInstanceMutationError = 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 function useCreateInstance<
-  TData = Awaited<ReturnType<typeof createInstance>>,
-  TError = ErrorType<void | DmError>,
->(
-  instancePostBodyBody: InstancePostBodyBody,
+export const useCreateInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createInstance>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof createInstance>>,
+      TError,
+      { data: InstancePostBodyBody },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): 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 };
-}
-
-/**
- * @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,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof createInstance>>,
+  TError,
+  { data: InstancePostBodyBody },
+  TContext
+> => {
+  return useMutation(getCreateInstanceMutationOptions(options), 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`
  *
@@ -332,7 +292,7 @@ export function useGetInstances<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -440,7 +400,7 @@ export function useGetInstancesSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -492,126 +452,68 @@ export const dryRunInstance = (
   );
 };
 
-export const getDryRunInstanceQueryKey = (instancePostBodyBody?: InstancePostBodyBody) => {
-  return ["data-manager", "POST", "instance", "dry-run", instancePostBodyBody] as const;
-};
-
-export const getDryRunInstanceQueryOptions = <
-  TData = Awaited<ReturnType<typeof dryRunInstance>>,
+export const getDryRunInstanceMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  instancePostBodyBody: InstancePostBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof dryRunInstance>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getDryRunInstanceQueryKey(instancePostBodyBody);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof dryRunInstance>>> = ({ signal }) =>
-    dryRunInstance(instancePostBodyBody, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof dryRunInstance>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, 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 ?? {};
+
+    return dryRunInstance(data, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type DryRunInstanceQueryResult = NonNullable<Awaited<ReturnType<typeof dryRunInstance>>>;
-export type DryRunInstanceQueryError = ErrorType<void | DmError>;
+export type DryRunInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof dryRunInstance>>>;
+export type DryRunInstanceMutationBody = InstancePostBodyBody;
+export type DryRunInstanceMutationError = 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 function useDryRunInstance<
-  TData = Awaited<ReturnType<typeof dryRunInstance>>,
-  TError = ErrorType<void | DmError>,
->(
-  instancePostBodyBody: InstancePostBodyBody,
+export const useDryRunInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof dryRunInstance>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof dryRunInstance>>,
+      TError,
+      { data: InstancePostBodyBody },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): 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 };
-}
-
-/**
- * @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;
+): UseMutationResult<
+  Awaited<ReturnType<typeof dryRunInstance>>,
+  TError,
+  { data: InstancePostBodyBody },
+  TContext
+> => {
+  return useMutation(getDryRunInstanceMutationOptions(options), queryClient);
 };
-
 /**
  * @summary Get detailed information about an Instance
  */
@@ -730,7 +632,7 @@ export function useGetInstance<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -836,7 +738,7 @@ export function useGetInstanceSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -856,131 +758,70 @@ export const terminateInstance = (
   );
 };
 
-export const getTerminateInstanceQueryKey = (instanceId: string) => {
-  return ["data-manager", "DELETE", "instance", instanceId] as const;
-};
-
-export const getTerminateInstanceQueryOptions = <
-  TData = Awaited<ReturnType<typeof terminateInstance>>,
+export const getTerminateInstanceMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  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);
-
-  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>;
+  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);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type TerminateInstanceQueryResult = NonNullable<
+export type TerminateInstanceMutationResult = NonNullable<
   Awaited<ReturnType<typeof terminateInstance>>
 >;
-export type TerminateInstanceQueryError = 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> };
+export type TerminateInstanceMutationError = ErrorType<void | DmError>;
+
 /**
  * @summary Delete a Job or Application Instance
  */
-
-export function useTerminateInstance<
-  TData = Awaited<ReturnType<typeof terminateInstance>>,
-  TError = ErrorType<void | DmError>,
->(
-  instanceId: string,
+export const useTerminateInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof terminateInstance>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof terminateInstance>>,
+      TError,
+      { instanceId: string },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): 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 };
-}
-
-/**
- * @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,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof terminateInstance>>,
+  TError,
+  { instanceId: string },
+  TContext
+> => {
+  return useMutation(getTerminateInstanceMutationOptions(options), queryClient);
 };
-
 /**
  * The Application or Job Instance is updated according to the patch parameters.
  *
@@ -999,135 +840,68 @@ export const patchInstance = (
   );
 };
 
-export const getPatchInstanceQueryKey = (instanceId: string, params?: PatchInstanceParams) => {
-  return ["data-manager", "PATCH", "instance", instanceId, ...(params ? [params] : [])] as const;
-};
-
-export const getPatchInstanceQueryOptions = <
-  TData = Awaited<ReturnType<typeof patchInstance>>,
+export const getPatchInstanceMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  instanceId: string,
-  params?: PatchInstanceParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchInstance>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getPatchInstanceQueryKey(instanceId, params);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof patchInstance>>> = ({ signal }) =>
-    patchInstance(instanceId, params, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: instanceId !== null && instanceId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof patchInstance>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  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);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type PatchInstanceQueryResult = NonNullable<Awaited<ReturnType<typeof patchInstance>>>;
-export type PatchInstanceQueryError = ErrorType<void | DmError>;
+export type PatchInstanceMutationResult = NonNullable<Awaited<ReturnType<typeof patchInstance>>>;
+
+export type PatchInstanceMutationError = 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 function usePatchInstance<
-  TData = Awaited<ReturnType<typeof patchInstance>>,
-  TError = ErrorType<void | DmError>,
->(
-  instanceId: string,
-  params?: PatchInstanceParams,
+export const usePatchInstance = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchInstance>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof patchInstance>>,
+      TError,
+      { instanceId: string; params?: PatchInstanceParams },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getPatchInstanceQueryOptions(instanceId, params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @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;
+): UseMutationResult<
+  Awaited<ReturnType<typeof patchInstance>>,
+  TError,
+  { instanceId: string; params?: PatchInstanceParams },
+  TContext
+> => {
+  return useMutation(getPatchInstanceMutationOptions(options), 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.
  *
@@ -1148,144 +922,67 @@ export const deleteInstanceToken = (
   );
 };
 
-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>>,
+export const getDeleteInstanceTokenMutationOptions = <
   TError = ErrorType<DmError>,
->(
-  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 {
-    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>;
+  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);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type DeleteInstanceTokenQueryResult = NonNullable<
+export type DeleteInstanceTokenMutationResult = NonNullable<
   Awaited<ReturnType<typeof deleteInstanceToken>>
 >;
-export type DeleteInstanceTokenQueryError = 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> };
+export type DeleteInstanceTokenMutationError = ErrorType<DmError>;
+
 /**
  * @summary Delete (revoke) the Instance Token
  */
-
-export function useDeleteInstanceToken<
-  TData = Awaited<ReturnType<typeof deleteInstanceToken>>,
-  TError = ErrorType<DmError>,
->(
-  instanceId: string,
-  token: string,
+export const useDeleteInstanceToken = <TError = ErrorType<DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof deleteInstanceToken>>, TError, TData>
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteInstanceToken>>,
+      TError,
+      { instanceId: string; token: string },
+      TContext
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): 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 };
-}
-
-/**
- * @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;
+): UseMutationResult<
+  Awaited<ReturnType<typeof deleteInstanceToken>>,
+  TError,
+  { instanceId: string; token: string },
+  TContext
+> => {
+  return useMutation(getDeleteInstanceTokenMutationOptions(options), queryClient);
 };