@squonk/data-manager-client 6.7.1 → 6.7.2

package/src/api/file-and-path/file-and-path.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,
@@ -45,6 +48,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;
+};
+
 /**
  * Creates a new Path within a Project. Every directory in the Path will be created. The path will belong to the User and Project.
  *
@@ -59,123 +77,68 @@ export const createPath = (
   return customInstance<void>({ url: `/path`, method: "PUT", params, signal }, options);
 };
 
-export const getCreatePathQueryKey = (params?: CreatePathParams) => {
-  return ["data-manager", "PUT", "path", ...(params ? [params] : [])] as const;
-};
-
-export const getCreatePathQueryOptions = <
-  TData = Awaited<ReturnType<typeof createPath>>,
+export const getCreatePathMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  params: CreatePathParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createPath>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getCreatePathQueryKey(params);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof createPath>>> = ({ signal }) =>
-    createPath(params, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof createPath>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+    { params: CreatePathParams },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof createPath>>,
+  TError,
+  { params: CreatePathParams },
+  TContext
+> => {
+  const mutationKey = ["createPath"];
+  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 createPath>>,
+    { params: CreatePathParams }
+  > = (props) => {
+    const { params } = props ?? {};
+
+    return createPath(params, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type CreatePathQueryResult = NonNullable<Awaited<ReturnType<typeof createPath>>>;
-export type CreatePathQueryError = ErrorType<void | DmError>;
+export type CreatePathMutationResult = NonNullable<Awaited<ReturnType<typeof createPath>>>;
+
+export type CreatePathMutationError = ErrorType<void | DmError>;
 
-export function useCreatePath<
-  TData = Awaited<ReturnType<typeof createPath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: CreatePathParams,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof createPath>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof createPath>>,
-          TError,
-          Awaited<ReturnType<typeof createPath>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useCreatePath<
-  TData = Awaited<ReturnType<typeof createPath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: CreatePathParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createPath>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof createPath>>,
-          TError,
-          Awaited<ReturnType<typeof createPath>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useCreatePath<
-  TData = Awaited<ReturnType<typeof createPath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: CreatePathParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createPath>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Create a new Project Path
  */
-
-export function useCreatePath<
-  TData = Awaited<ReturnType<typeof createPath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: CreatePathParams,
+export const useCreatePath = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createPath>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof createPath>>,
+      TError,
+      { params: CreatePathParams },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getCreatePathQueryOptions(params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Create a new Project Path
- */
-export const invalidateCreatePath = async (
-  queryClient: QueryClient,
-  params: CreatePathParams,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries({ queryKey: getCreatePathQueryKey(params) }, options);
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof createPath>>,
+  TError,
+  { params: CreatePathParams },
+  TContext
+> => {
+  return useMutation(getCreatePathMutationOptions(options), queryClient);
 };
-
 /**
  * Deletes a Path within the Project. Be aware that the deletion of a Path will result in the contents of the Path also being deleted. If there are files in Path or sub-directories, they will all be deleted.
  *
@@ -190,123 +153,68 @@ export const deletePath = (
   return customInstance<void>({ url: `/path`, method: "DELETE", params, signal }, options);
 };
 
-export const getDeletePathQueryKey = (params?: DeletePathParams) => {
-  return ["data-manager", "DELETE", "path", ...(params ? [params] : [])] as const;
-};
-
-export const getDeletePathQueryOptions = <
-  TData = Awaited<ReturnType<typeof deletePath>>,
+export const getDeletePathMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  params: DeletePathParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deletePath>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getDeletePathQueryKey(params);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof deletePath>>> = ({ signal }) =>
-    deletePath(params, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof deletePath>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+    { params: DeletePathParams },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deletePath>>,
+  TError,
+  { params: DeletePathParams },
+  TContext
+> => {
+  const mutationKey = ["deletePath"];
+  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 deletePath>>,
+    { params: DeletePathParams }
+  > = (props) => {
+    const { params } = props ?? {};
+
+    return deletePath(params, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type DeletePathQueryResult = NonNullable<Awaited<ReturnType<typeof deletePath>>>;
-export type DeletePathQueryError = ErrorType<void | DmError>;
+export type DeletePathMutationResult = NonNullable<Awaited<ReturnType<typeof deletePath>>>;
+
+export type DeletePathMutationError = ErrorType<void | DmError>;
 
-export function useDeletePath<
-  TData = Awaited<ReturnType<typeof deletePath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: DeletePathParams,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof deletePath>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deletePath>>,
-          TError,
-          Awaited<ReturnType<typeof deletePath>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeletePath<
-  TData = Awaited<ReturnType<typeof deletePath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: DeletePathParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deletePath>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deletePath>>,
-          TError,
-          Awaited<ReturnType<typeof deletePath>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeletePath<
-  TData = Awaited<ReturnType<typeof deletePath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: DeletePathParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deletePath>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Project Path
  */
-
-export function useDeletePath<
-  TData = Awaited<ReturnType<typeof deletePath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: DeletePathParams,
+export const useDeletePath = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deletePath>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deletePath>>,
+      TError,
+      { params: DeletePathParams },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getDeletePathQueryOptions(params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Delete a Project Path
- */
-export const invalidateDeletePath = async (
-  queryClient: QueryClient,
-  params: DeletePathParams,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries({ queryKey: getDeletePathQueryKey(params) }, options);
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof deletePath>>,
+  TError,
+  { params: DeletePathParams },
+  TContext
+> => {
+  return useMutation(getDeletePathMutationOptions(options), queryClient);
 };
-
 /**
  * Moves and existing Path within a Project. The path will belong to the User and Project. Any ProjectFile instances on the path will be moved to the new path.
  *
@@ -321,123 +229,68 @@ export const movePath = (
   return customInstance<void>({ url: `/path/move`, method: "PUT", params, signal }, options);
 };
 
-export const getMovePathQueryKey = (params?: MovePathParams) => {
-  return ["data-manager", "PUT", "path", "move", ...(params ? [params] : [])] as const;
-};
-
-export const getMovePathQueryOptions = <
-  TData = Awaited<ReturnType<typeof movePath>>,
+export const getMovePathMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  params: MovePathParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof movePath>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getMovePathQueryKey(params);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof movePath>>> = ({ signal }) =>
-    movePath(params, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof movePath>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+    { params: MovePathParams },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof movePath>>,
+  TError,
+  { params: MovePathParams },
+  TContext
+> => {
+  const mutationKey = ["movePath"];
+  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 movePath>>,
+    { params: MovePathParams }
+  > = (props) => {
+    const { params } = props ?? {};
+
+    return movePath(params, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type MovePathQueryResult = NonNullable<Awaited<ReturnType<typeof movePath>>>;
-export type MovePathQueryError = ErrorType<void | DmError>;
+export type MovePathMutationResult = NonNullable<Awaited<ReturnType<typeof movePath>>>;
+
+export type MovePathMutationError = ErrorType<void | DmError>;
 
-export function useMovePath<
-  TData = Awaited<ReturnType<typeof movePath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: MovePathParams,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof movePath>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof movePath>>,
-          TError,
-          Awaited<ReturnType<typeof movePath>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useMovePath<
-  TData = Awaited<ReturnType<typeof movePath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: MovePathParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof movePath>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof movePath>>,
-          TError,
-          Awaited<ReturnType<typeof movePath>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useMovePath<
-  TData = Awaited<ReturnType<typeof movePath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: MovePathParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof movePath>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Move a Project Path
  */
-
-export function useMovePath<
-  TData = Awaited<ReturnType<typeof movePath>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: MovePathParams,
+export const useMovePath = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof movePath>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof movePath>>,
+      TError,
+      { params: MovePathParams },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getMovePathQueryOptions(params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Move a Project Path
- */
-export const invalidateMovePath = async (
-  queryClient: QueryClient,
-  params: MovePathParams,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries({ queryKey: getMovePathQueryKey(params) }, options);
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof movePath>>,
+  TError,
+  { params: MovePathParams },
+  TContext
+> => {
+  return useMutation(getMovePathMutationOptions(options), queryClient);
 };
-
 /**
  * Gets a file from the project, with an optional path. This method should be used to get arbitrary files from the Project's file system (typically **unmanaged** files).
  *
@@ -567,7 +420,7 @@ export function useGetProjectFile<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -686,7 +539,7 @@ export function useGetProjectFileSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -722,139 +575,70 @@ export const addFileToProject = (
   );
 };
 
-export const getAddFileToProjectQueryKey = (
-  projectId: string,
-  projectFilePutBodyBody?: ProjectFilePutBodyBody,
-) => {
-  return ["data-manager", "PUT", "project", projectId, "file", projectFilePutBodyBody] as const;
+export const getAddFileToProjectMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof addFileToProject>>,
+    TError,
+    { projectId: string; data: ProjectFilePutBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof addFileToProject>>,
+  TError,
+  { projectId: string; data: ProjectFilePutBodyBody },
+  TContext
+> => {
+  const mutationKey = ["addFileToProject"];
+  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 addFileToProject>>,
+    { projectId: string; data: ProjectFilePutBodyBody }
+  > = (props) => {
+    const { projectId, data } = props ?? {};
+
+    return addFileToProject(projectId, data, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export const getAddFileToProjectQueryOptions = <
-  TData = Awaited<ReturnType<typeof addFileToProject>>,
-  TError = ErrorType<void | DmError>,
->(
-  projectId: string,
-  projectFilePutBodyBody: ProjectFilePutBodyBody,
+export type AddFileToProjectMutationResult = NonNullable<
+  Awaited<ReturnType<typeof addFileToProject>>
+>;
+export type AddFileToProjectMutationBody = ProjectFilePutBodyBody;
+export type AddFileToProjectMutationError = ErrorType<void | DmError>;
+
+/**
+ * @summary Upload a file into a Project
+ */
+export const useAddFileToProject = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addFileToProject>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getAddFileToProjectQueryKey(projectId, projectFilePutBodyBody);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof addFileToProject>>> = ({ signal }) =>
-    addFileToProject(projectId, projectFilePutBodyBody, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: projectId !== null && projectId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof addFileToProject>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-};
-
-export type AddFileToProjectQueryResult = NonNullable<Awaited<ReturnType<typeof addFileToProject>>>;
-export type AddFileToProjectQueryError = ErrorType<void | DmError>;
-
-export function useAddFileToProject<
-  TData = Awaited<ReturnType<typeof addFileToProject>>,
-  TError = ErrorType<void | DmError>,
->(
-  projectId: string,
-  projectFilePutBodyBody: ProjectFilePutBodyBody,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof addFileToProject>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof addFileToProject>>,
-          TError,
-          Awaited<ReturnType<typeof addFileToProject>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAddFileToProject<
-  TData = Awaited<ReturnType<typeof addFileToProject>>,
-  TError = ErrorType<void | DmError>,
->(
-  projectId: string,
-  projectFilePutBodyBody: ProjectFilePutBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addFileToProject>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof addFileToProject>>,
-          TError,
-          Awaited<ReturnType<typeof addFileToProject>>
-        >,
-        "initialData"
-      >;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof addFileToProject>>,
+      TError,
+      { projectId: string; data: ProjectFilePutBodyBody },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAddFileToProject<
-  TData = Awaited<ReturnType<typeof addFileToProject>>,
-  TError = ErrorType<void | DmError>,
->(
-  projectId: string,
-  projectFilePutBodyBody: ProjectFilePutBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addFileToProject>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-/**
- * @summary Upload a file into a Project
- */
-
-export function useAddFileToProject<
-  TData = Awaited<ReturnType<typeof addFileToProject>>,
-  TError = ErrorType<void | DmError>,
->(
-  projectId: string,
-  projectFilePutBodyBody: ProjectFilePutBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addFileToProject>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAddFileToProjectQueryOptions(projectId, projectFilePutBodyBody, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Upload a file into a Project
- */
-export const invalidateAddFileToProject = async (
-  queryClient: QueryClient,
-  projectId: string,
-  projectFilePutBodyBody: ProjectFilePutBodyBody,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getAddFileToProjectQueryKey(projectId, projectFilePutBodyBody) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof addFileToProject>>,
+  TError,
+  { projectId: string; data: ProjectFilePutBodyBody },
+  TContext
+> => {
+  return useMutation(getAddFileToProjectMutationOptions(options), queryClient);
 };
-
 /**
  * Gets a file from the project, with an optional path. This method should be used to get arbitrary files from the Project's file system (typically **unmanaged** files).
  *
@@ -1006,7 +790,7 @@ export function useGetProjectFileWithToken<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1126,7 +910,7 @@ export function useGetProjectFileWithTokenSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1242,7 +1026,7 @@ export function useGetFiles<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1340,7 +1124,7 @@ export function useGetFilesSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1387,126 +1171,68 @@ export const attachFile = (
   );
 };
 
-export const getAttachFileQueryKey = (filePostBodyBody?: FilePostBodyBody) => {
-  return ["data-manager", "POST", "file", filePostBodyBody] as const;
-};
-
-export const getAttachFileQueryOptions = <
-  TData = Awaited<ReturnType<typeof attachFile>>,
+export const getAttachFileMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  filePostBodyBody: FilePostBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof attachFile>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getAttachFileQueryKey(filePostBodyBody);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof attachFile>>> = ({ signal }) =>
-    attachFile(filePostBodyBody, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof attachFile>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+    { data: FilePostBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof attachFile>>,
+  TError,
+  { data: FilePostBodyBody },
+  TContext
+> => {
+  const mutationKey = ["attachFile"];
+  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 attachFile>>,
+    { data: FilePostBodyBody }
+  > = (props) => {
+    const { data } = props ?? {};
+
+    return attachFile(data, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type AttachFileQueryResult = NonNullable<Awaited<ReturnType<typeof attachFile>>>;
-export type AttachFileQueryError = ErrorType<void | DmError>;
+export type AttachFileMutationResult = NonNullable<Awaited<ReturnType<typeof attachFile>>>;
+export type AttachFileMutationBody = FilePostBodyBody;
+export type AttachFileMutationError = ErrorType<void | DmError>;
 
-export function useAttachFile<
-  TData = Awaited<ReturnType<typeof attachFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  filePostBodyBody: FilePostBodyBody,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof attachFile>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof attachFile>>,
-          TError,
-          Awaited<ReturnType<typeof attachFile>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAttachFile<
-  TData = Awaited<ReturnType<typeof attachFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  filePostBodyBody: FilePostBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof attachFile>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof attachFile>>,
-          TError,
-          Awaited<ReturnType<typeof attachFile>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAttachFile<
-  TData = Awaited<ReturnType<typeof attachFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  filePostBodyBody: FilePostBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof attachFile>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Attach a Dataset, as a File, to a Project
  */
-
-export function useAttachFile<
-  TData = Awaited<ReturnType<typeof attachFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  filePostBodyBody: FilePostBodyBody,
+export const useAttachFile = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof attachFile>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof attachFile>>,
+      TError,
+      { data: FilePostBodyBody },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAttachFileQueryOptions(filePostBodyBody, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Attach a Dataset, as a File, to a Project
- */
-export const invalidateAttachFile = async (
-  queryClient: QueryClient,
-  filePostBodyBody: FilePostBodyBody,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getAttachFileQueryKey(filePostBodyBody) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof attachFile>>,
+  TError,
+  { data: FilePostBodyBody },
+  TContext
+> => {
+  return useMutation(getAttachFileMutationOptions(options), queryClient);
 };
-
 /**
  * Removes an unmanaged file from a Project. You cannot use this endpoint to delete managed project files.
  *
@@ -1521,138 +1247,70 @@ export const deleteUnmanagedFile = (
   return customInstance<void>({ url: `/file`, method: "DELETE", params, signal }, options);
 };
 
-export const getDeleteUnmanagedFileQueryKey = (params?: DeleteUnmanagedFileParams) => {
-  return ["data-manager", "DELETE", "file", ...(params ? [params] : [])] as const;
-};
-
-export const getDeleteUnmanagedFileQueryOptions = <
-  TData = Awaited<ReturnType<typeof deleteUnmanagedFile>>,
+export const getDeleteUnmanagedFileMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  params: DeleteUnmanagedFileParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof deleteUnmanagedFile>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getDeleteUnmanagedFileQueryKey(params);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteUnmanagedFile>>> = ({ signal }) =>
-    deleteUnmanagedFile(params, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof deleteUnmanagedFile>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+    { params: DeleteUnmanagedFileParams },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteUnmanagedFile>>,
+  TError,
+  { params: DeleteUnmanagedFileParams },
+  TContext
+> => {
+  const mutationKey = ["deleteUnmanagedFile"];
+  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 deleteUnmanagedFile>>,
+    { params: DeleteUnmanagedFileParams }
+  > = (props) => {
+    const { params } = props ?? {};
+
+    return deleteUnmanagedFile(params, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type DeleteUnmanagedFileQueryResult = NonNullable<
+export type DeleteUnmanagedFileMutationResult = NonNullable<
   Awaited<ReturnType<typeof deleteUnmanagedFile>>
 >;
-export type DeleteUnmanagedFileQueryError = ErrorType<void | DmError>;
 
-export function useDeleteUnmanagedFile<
-  TData = Awaited<ReturnType<typeof deleteUnmanagedFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: DeleteUnmanagedFileParams,
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof deleteUnmanagedFile>>, TError, TData>
-    > &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deleteUnmanagedFile>>,
-          TError,
-          Awaited<ReturnType<typeof deleteUnmanagedFile>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeleteUnmanagedFile<
-  TData = Awaited<ReturnType<typeof deleteUnmanagedFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: DeleteUnmanagedFileParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof deleteUnmanagedFile>>, TError, TData>
-    > &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deleteUnmanagedFile>>,
-          TError,
-          Awaited<ReturnType<typeof deleteUnmanagedFile>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeleteUnmanagedFile<
-  TData = Awaited<ReturnType<typeof deleteUnmanagedFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: DeleteUnmanagedFileParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof deleteUnmanagedFile>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export type DeleteUnmanagedFileMutationError = ErrorType<void | DmError>;
+
 /**
  * @summary Delete an unmanaged Project File
  */
-
-export function useDeleteUnmanagedFile<
-  TData = Awaited<ReturnType<typeof deleteUnmanagedFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: DeleteUnmanagedFileParams,
+export const useDeleteUnmanagedFile = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof deleteUnmanagedFile>>, TError, TData>
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteUnmanagedFile>>,
+      TError,
+      { params: DeleteUnmanagedFileParams },
+      TContext
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getDeleteUnmanagedFileQueryOptions(params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Delete an unmanaged Project File
- */
-export const invalidateDeleteUnmanagedFile = async (
-  queryClient: QueryClient,
-  params: DeleteUnmanagedFileParams,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getDeleteUnmanagedFileQueryKey(params) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof deleteUnmanagedFile>>,
+  TError,
+  { params: DeleteUnmanagedFileParams },
+  TContext
+> => {
+  return useMutation(getDeleteUnmanagedFileMutationOptions(options), queryClient);
 };
-
 /**
  * Move an **Unmanaged** file, optionally renaming it, to a new path.
  *
@@ -1667,125 +1325,70 @@ export const moveFileInProject = (
   return customInstance<void>({ url: `/file/move`, method: "PUT", params, signal }, options);
 };
 
-export const getMoveFileInProjectQueryKey = (params?: MoveFileInProjectParams) => {
-  return ["data-manager", "PUT", "file", "move", ...(params ? [params] : [])] as const;
-};
-
-export const getMoveFileInProjectQueryOptions = <
-  TData = Awaited<ReturnType<typeof moveFileInProject>>,
+export const getMoveFileInProjectMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  params: MoveFileInProjectParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof moveFileInProject>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getMoveFileInProjectQueryKey(params);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof moveFileInProject>>> = ({ signal }) =>
-    moveFileInProject(params, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof moveFileInProject>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+    { params: MoveFileInProjectParams },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof moveFileInProject>>,
+  TError,
+  { params: MoveFileInProjectParams },
+  TContext
+> => {
+  const mutationKey = ["moveFileInProject"];
+  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 moveFileInProject>>,
+    { params: MoveFileInProjectParams }
+  > = (props) => {
+    const { params } = props ?? {};
+
+    return moveFileInProject(params, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type MoveFileInProjectQueryResult = NonNullable<
+export type MoveFileInProjectMutationResult = NonNullable<
   Awaited<ReturnType<typeof moveFileInProject>>
 >;
-export type MoveFileInProjectQueryError = ErrorType<void | DmError>;
 
-export function useMoveFileInProject<
-  TData = Awaited<ReturnType<typeof moveFileInProject>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: MoveFileInProjectParams,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof moveFileInProject>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof moveFileInProject>>,
-          TError,
-          Awaited<ReturnType<typeof moveFileInProject>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useMoveFileInProject<
-  TData = Awaited<ReturnType<typeof moveFileInProject>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: MoveFileInProjectParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof moveFileInProject>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof moveFileInProject>>,
-          TError,
-          Awaited<ReturnType<typeof moveFileInProject>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useMoveFileInProject<
-  TData = Awaited<ReturnType<typeof moveFileInProject>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: MoveFileInProjectParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof moveFileInProject>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export type MoveFileInProjectMutationError = ErrorType<void | DmError>;
+
 /**
  * @summary Move an unmanaged file in a Project
  */
-
-export function useMoveFileInProject<
-  TData = Awaited<ReturnType<typeof moveFileInProject>>,
-  TError = ErrorType<void | DmError>,
->(
-  params: MoveFileInProjectParams,
+export const useMoveFileInProject = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof moveFileInProject>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof moveFileInProject>>,
+      TError,
+      { params: MoveFileInProjectParams },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getMoveFileInProjectQueryOptions(params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Move an unmanaged file in a Project
- */
-export const invalidateMoveFileInProject = async (
-  queryClient: QueryClient,
-  params: MoveFileInProjectParams,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries({ queryKey: getMoveFileInProjectQueryKey(params) }, options);
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof moveFileInProject>>,
+  TError,
+  { params: MoveFileInProjectParams },
+  TContext
+> => {
+  return useMutation(getMoveFileInProjectMutationOptions(options), queryClient);
 };
-
 /**
  * Given a `file_id` the file will be removed from the Project it's attached to.
  *
@@ -1802,126 +1405,67 @@ export const deleteFile = (
   return customInstance<void>({ url: `/file/${fileId}`, method: "DELETE", signal }, options);
 };
 
-export const getDeleteFileQueryKey = (fileId: string) => {
-  return ["data-manager", "DELETE", "file", fileId] as const;
-};
-
-export const getDeleteFileQueryOptions = <
-  TData = Awaited<ReturnType<typeof deleteFile>>,
+export const getDeleteFileMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  fileId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteFile>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getDeleteFileQueryKey(fileId);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteFile>>> = ({ signal }) =>
-    deleteFile(fileId, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: fileId !== null && fileId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof deleteFile>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof deleteFile>>,
+    TError,
+    { fileId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteFile>>,
+  TError,
+  { fileId: string },
+  TContext
+> => {
+  const mutationKey = ["deleteFile"];
+  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 deleteFile>>, { fileId: string }> = (
+    props,
+  ) => {
+    const { fileId } = props ?? {};
+
+    return deleteFile(fileId, requestOptions);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type DeleteFileQueryResult = NonNullable<Awaited<ReturnType<typeof deleteFile>>>;
-export type DeleteFileQueryError = ErrorType<void | DmError>;
+export type DeleteFileMutationResult = NonNullable<Awaited<ReturnType<typeof deleteFile>>>;
+
+export type DeleteFileMutationError = ErrorType<void | DmError>;
 
-export function useDeleteFile<
-  TData = Awaited<ReturnType<typeof deleteFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  fileId: string,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteFile>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deleteFile>>,
-          TError,
-          Awaited<ReturnType<typeof deleteFile>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeleteFile<
-  TData = Awaited<ReturnType<typeof deleteFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  fileId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteFile>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deleteFile>>,
-          TError,
-          Awaited<ReturnType<typeof deleteFile>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeleteFile<
-  TData = Awaited<ReturnType<typeof deleteFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  fileId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteFile>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete/detach a File (from a Project)
  */
-
-export function useDeleteFile<
-  TData = Awaited<ReturnType<typeof deleteFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  fileId: string,
+export const useDeleteFile = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteFile>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteFile>>,
+      TError,
+      { fileId: string },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getDeleteFileQueryOptions(fileId, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Delete/detach a File (from a Project)
- */
-export const invalidateDeleteFile = async (
-  queryClient: QueryClient,
-  fileId: string,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries({ queryKey: getDeleteFileQueryKey(fileId) }, options);
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof deleteFile>>,
+  TError,
+  { fileId: string },
+  TContext
+> => {
+  return useMutation(getDeleteFileMutationOptions(options), queryClient);
 };
-
 /**
  * Given a `file_id` the file will be returned if available.
  *
@@ -2040,7 +1584,7 @@ export function useDownloadFile<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -2148,5 +1692,5 @@ export function useDownloadFileSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }