@squonk/data-manager-client 5.4.0 → 6.1.0

package/src/api/file-and-path/file-and-path.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.1
  */
-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,
@@ -41,7 +38,7 @@ import type {
   MoveFileInProjectParams,
   MovePathParams,
   ProjectFilePutBodyBody,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customInstance } from "../../custom-axios";
 import type { ErrorType } from "../../custom-axios";
@@ -50,245 +47,403 @@ type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
 /**
  * Creates a new Path within a Project. Every directory in the Path will be created. The path will belong to the User and Project.
-
-Only Project editors can create Paths.
-
+ *
+ * Only Project editors can create Paths.
  * @summary Create a new Project Path
  */
 export const createPath = (
   params: CreatePathParams,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<void>({ url: `/path`, method: "PUT", params }, options);
+  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 getCreatePathMutationOptions = <
+export const getCreatePathQueryOptions = <
+  TData = Awaited<ReturnType<typeof createPath>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createPath>>,
-    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 ?? {};
+>(
+  params: CreatePathParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createPath>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return createPath(params, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getCreatePathQueryKey(params);
 
-  return { mutationFn, ...mutationOptions };
-};
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof createPath>>> = ({ signal }) =>
+    createPath(params, requestOptions, signal);
 
-export type CreatePathMutationResult = NonNullable<Awaited<ReturnType<typeof createPath>>>;
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof createPath>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
 
-export type CreatePathMutationError = ErrorType<void | DmError>;
+export type CreatePathQueryResult = NonNullable<Awaited<ReturnType<typeof createPath>>>;
+export type CreatePathQueryError = 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 const useCreatePath = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useCreatePath<
+  TData = Awaited<ReturnType<typeof createPath>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: CreatePathParams,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createPath>>,
-      TError,
-      { params: CreatePathParams },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createPath>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createPath>>,
-  TError,
-  { params: CreatePathParams },
-  TContext
-> => {
-  const mutationOptions = getCreatePathMutationOptions(options);
+): 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 };
+}
 
-  return useMutation(mutationOptions, 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.
+ * @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);
 
-Only Project editors can delete Paths.
+  return 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.
+ *
+ * Only Project editors can delete Paths.
  * @summary Delete a Project Path
  */
 export const deletePath = (
   params: DeletePathParams,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<void>({ url: `/path`, method: "DELETE", params }, options);
+  return customInstance<void>({ url: `/path`, method: "DELETE", params, signal }, options);
 };
 
-export const getDeletePathMutationOptions = <
+export const getDeletePathQueryKey = (params?: DeletePathParams) => {
+  return ["data-manager", "DELETE", "path", ...(params ? [params] : [])] as const;
+};
+
+export const getDeletePathQueryOptions = <
+  TData = Awaited<ReturnType<typeof deletePath>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deletePath>>,
-    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 ?? {};
+>(
+  params: DeletePathParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deletePath>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return deletePath(params, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getDeletePathQueryKey(params);
 
-  return { mutationFn, ...mutationOptions };
-};
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof deletePath>>> = ({ signal }) =>
+    deletePath(params, requestOptions, signal);
 
-export type DeletePathMutationResult = NonNullable<Awaited<ReturnType<typeof deletePath>>>;
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof deletePath>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
 
-export type DeletePathMutationError = ErrorType<void | DmError>;
+export type DeletePathQueryResult = NonNullable<Awaited<ReturnType<typeof deletePath>>>;
+export type DeletePathQueryError = 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 const useDeletePath = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useDeletePath<
+  TData = Awaited<ReturnType<typeof deletePath>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: DeletePathParams,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deletePath>>,
-      TError,
-      { params: DeletePathParams },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deletePath>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deletePath>>,
-  TError,
-  { params: DeletePathParams },
-  TContext
-> => {
-  const mutationOptions = getDeletePathMutationOptions(options);
+): 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 };
+}
 
-  return useMutation(mutationOptions, 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.
+ * @summary Delete a Project Path
+ */
+export const invalidateDeletePath = async (
+  queryClient: QueryClient,
+  params: DeletePathParams,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries({ queryKey: getDeletePathQueryKey(params) }, options);
 
-Only Project editors can move Paths.
+  return 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.
+ *
+ * Only Project editors can move Paths.
  * @summary Move a Project Path
  */
 export const movePath = (
   params: MovePathParams,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<void>({ url: `/path/move`, method: "PUT", params }, options);
+  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 getMovePathMutationOptions = <
+export const getMovePathQueryOptions = <
+  TData = Awaited<ReturnType<typeof movePath>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof movePath>>,
-    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 ?? {};
+>(
+  params: MovePathParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof movePath>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return movePath(params, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getMovePathQueryKey(params);
 
-  return { mutationFn, ...mutationOptions };
-};
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof movePath>>> = ({ signal }) =>
+    movePath(params, requestOptions, signal);
 
-export type MovePathMutationResult = NonNullable<Awaited<ReturnType<typeof movePath>>>;
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof movePath>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
 
-export type MovePathMutationError = ErrorType<void | DmError>;
+export type MovePathQueryResult = NonNullable<Awaited<ReturnType<typeof movePath>>>;
+export type MovePathQueryError = 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 const useMovePath = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useMovePath<
+  TData = Awaited<ReturnType<typeof movePath>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: MovePathParams,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof movePath>>,
-      TError,
-      { params: MovePathParams },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof movePath>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof movePath>>,
-  TError,
-  { params: MovePathParams },
-  TContext
-> => {
-  const mutationOptions = getMovePathMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getMovePathQueryOptions(params, options);
 
-  return useMutation(mutationOptions, 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).
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-For **managed** files you should consider using the `/file/{file_id}` endpoint.
+/**
+ * @summary Move a Project Path
+ */
+export const invalidateMovePath = async (
+  queryClient: QueryClient,
+  params: MovePathParams,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries({ queryKey: getMovePathQueryKey(params) }, options);
 
-You must be an `editor` of the Project if the Project is `private`
+  return 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).
+ *
+ * For **managed** files you should consider using the `/file/{file_id}` endpoint.
+ *
+ * You must be an `editor` of the Project if the Project is `private`
  * @summary Download a Project file
  */
 export const getProjectFile = (
@@ -303,7 +458,7 @@ export const getProjectFile = (
   );
 };
 
-export const getGetProjectFileQueryKey = (projectId?: string, params?: GetProjectFileParams) => {
+export const getGetProjectFileQueryKey = (projectId: string, params?: GetProjectFileParams) => {
   return ["data-manager", "project", projectId, "file", ...(params ? [params] : [])] as const;
 };
 
@@ -325,11 +480,14 @@ export const getGetProjectFileQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getProjectFile>>> = ({ signal }) =>
     getProjectFile(projectId, params, requestOptions, signal);
 
-  return { queryKey, queryFn, enabled: !!projectId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getProjectFile>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: projectId !== null && projectId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getProjectFile>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetProjectFileQueryResult = NonNullable<Awaited<ReturnType<typeof getProjectFile>>>;
@@ -354,7 +512,7 @@ export function useGetProjectFile<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectFile<
   TData = Awaited<ReturnType<typeof getProjectFile>>,
   TError = ErrorType<void | DmError>,
@@ -374,7 +532,7 @@ export function useGetProjectFile<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectFile<
   TData = Awaited<ReturnType<typeof getProjectFile>>,
   TError = ErrorType<void | DmError>,
@@ -386,7 +544,7 @@ export function useGetProjectFile<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Download a Project file
  */
@@ -402,16 +560,14 @@ export function useGetProjectFile<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProjectFileQueryOptions(projectId, 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 };
 }
 
 /**
@@ -455,7 +611,7 @@ export const getGetProjectFileSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProjectFile>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProjectFileSuspenseQueryResult = NonNullable<
@@ -476,7 +632,7 @@ export function useGetProjectFileSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectFileSuspense<
   TData = Awaited<ReturnType<typeof getProjectFile>>,
   TError = ErrorType<void | DmError>,
@@ -490,7 +646,7 @@ export function useGetProjectFileSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectFileSuspense<
   TData = Awaited<ReturnType<typeof getProjectFile>>,
   TError = ErrorType<void | DmError>,
@@ -504,7 +660,7 @@ export function useGetProjectFileSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Download a Project file
  */
@@ -522,30 +678,28 @@ export function useGetProjectFileSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProjectFileSuspenseQueryOptions(projectId, 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 };
 }
 
 /**
  * The user provides an external file for upload to the Project using an optional Path. The path is created if it does not exist.
-
-You must be an `editor` of the project
-
+ *
+ * You must be an `editor` of the project
  * @summary Upload a file into a Project
  */
 export const addFileToProject = (
   projectId: string,
   projectFilePutBodyBody: ProjectFilePutBodyBody,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   const formData = new FormData();
   formData.append(`file`, projectFilePutBodyBody.file);
@@ -562,84 +716,151 @@ export const addFileToProject = (
       method: "PUT",
       headers: { "Content-Type": "multipart/form-data" },
       data: formData,
+      signal,
     },
     options,
   );
 };
 
-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 getAddFileToProjectQueryKey = (
+  projectId: string,
+  projectFilePutBodyBody?: ProjectFilePutBodyBody,
+) => {
+  return ["data-manager", "PUT", "project", projectId, "file", projectFilePutBodyBody] as const;
 };
 
-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>(
+export const getAddFileToProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof addFileToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  projectFilePutBodyBody: ProjectFilePutBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof addFileToProject>>,
-      TError,
-      { projectId: string; data: ProjectFilePutBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addFileToProject>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof addFileToProject>>,
-  TError,
-  { projectId: string; data: ProjectFilePutBodyBody },
-  TContext
-> => {
-  const mutationOptions = getAddFileToProjectMutationOptions(options);
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey =
+    queryOptions?.queryKey ?? getAddFileToProjectQueryKey(projectId, projectFilePutBodyBody);
 
-  return useMutation(mutationOptions, queryClient);
+  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"
+      >;
+    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> };
 /**
- * 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).
+ * @summary Upload a file into a Project
+ */
 
-For **managed** files you should consider using the `/file/{file_id}` endpoint.
+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,
+  );
 
-As there is no authentication for this endpoint you must provide a valid token. The token must be a token valid for the project, usually generated when an **Instance** has been launched in the Project.
+  return 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).
+ *
+ * For **managed** files you should consider using the `/file/{file_id}` endpoint.
+ *
+ * As there is no authentication for this endpoint you must provide a valid token. The token must be a token valid for the project, usually generated when an **Instance** has been launched in the Project.
  * @summary Download a Project file using a Token
  */
 export const getProjectFileWithToken = (
@@ -655,7 +876,7 @@ export const getProjectFileWithToken = (
 };
 
 export const getGetProjectFileWithTokenQueryKey = (
-  projectId?: string,
+  projectId: string,
   params?: GetProjectFileWithTokenParams,
 ) => {
   return [
@@ -688,11 +909,14 @@ export const getGetProjectFileWithTokenQueryOptions = <
     signal,
   }) => getProjectFileWithToken(projectId, params, requestOptions, signal);
 
-  return { queryKey, queryFn, enabled: !!projectId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getProjectFileWithToken>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: projectId !== null && projectId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getProjectFileWithToken>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetProjectFileWithTokenQueryResult = NonNullable<
@@ -721,7 +945,7 @@ export function useGetProjectFileWithToken<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectFileWithToken<
   TData = Awaited<ReturnType<typeof getProjectFileWithToken>>,
   TError = ErrorType<DmError>,
@@ -743,7 +967,7 @@ export function useGetProjectFileWithToken<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectFileWithToken<
   TData = Awaited<ReturnType<typeof getProjectFileWithToken>>,
   TError = ErrorType<DmError>,
@@ -757,7 +981,7 @@ export function useGetProjectFileWithToken<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Download a Project file using a Token
  */
@@ -775,16 +999,14 @@ export function useGetProjectFileWithToken<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProjectFileWithTokenQueryOptions(projectId, 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 };
 }
 
 /**
@@ -829,7 +1051,7 @@ export const getGetProjectFileWithTokenSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProjectFileWithToken>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProjectFileWithTokenSuspenseQueryResult = NonNullable<
@@ -850,7 +1072,7 @@ export function useGetProjectFileWithTokenSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectFileWithTokenSuspense<
   TData = Awaited<ReturnType<typeof getProjectFileWithToken>>,
   TError = ErrorType<DmError>,
@@ -864,7 +1086,7 @@ export function useGetProjectFileWithTokenSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectFileWithTokenSuspense<
   TData = Awaited<ReturnType<typeof getProjectFileWithToken>>,
   TError = ErrorType<DmError>,
@@ -878,7 +1100,7 @@ export function useGetProjectFileWithTokenSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Download a Project file using a Token
  */
@@ -896,22 +1118,19 @@ export function useGetProjectFileWithTokenSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProjectFileWithTokenSuspenseQueryOptions(projectId, params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
  * Given a Project and Path the files available to you on that path will be returned along with any additional paths (sub-directories).
-
  * @summary Gets the Files on a Project Path
  */
 export const getFiles = (
@@ -947,7 +1166,7 @@ export const getGetFilesQueryOptions = <
     Awaited<ReturnType<typeof getFiles>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetFilesQueryResult = NonNullable<Awaited<ReturnType<typeof getFiles>>>;
@@ -971,7 +1190,7 @@ export function useGetFiles<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetFiles<
   TData = Awaited<ReturnType<typeof getFiles>>,
   TError = ErrorType<void | DmError>,
@@ -990,7 +1209,7 @@ export function useGetFiles<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetFiles<
   TData = Awaited<ReturnType<typeof getFiles>>,
   TError = ErrorType<void | DmError>,
@@ -1001,7 +1220,7 @@ export function useGetFiles<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the Files on a Project Path
  */
@@ -1016,16 +1235,14 @@ export function useGetFiles<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetFilesQueryOptions(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 };
 }
 
 /**
@@ -1062,7 +1279,7 @@ export const getGetFilesSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getFiles>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetFilesSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getFiles>>>;
@@ -1078,7 +1295,7 @@ export function useGetFilesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetFilesSuspense<
   TData = Awaited<ReturnType<typeof getFiles>>,
   TError = ErrorType<void | DmError>,
@@ -1089,7 +1306,7 @@ export function useGetFilesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetFilesSuspense<
   TData = Awaited<ReturnType<typeof getFiles>>,
   TError = ErrorType<void | DmError>,
@@ -1100,7 +1317,7 @@ export function useGetFilesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the Files on a Project Path
  */
@@ -1115,30 +1332,27 @@ export function useGetFilesSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetFilesSuspenseQueryOptions(params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
  * Given a Project and a Dataset the Dataset will be attached (added) to the project as a File using the format provided. When attached the Dataset is referred to as a Project **File**. As format conversion may take some time the file may not be immediately available. You should use the `task_id` you're presented with on the `/task` endpoint to determine when the file is available to the project.
-
-Only Datasets attached to projects are available through the Project API. A Dataset that you upload is only available to others (who are not already `editors` of the data) when the Dataset is attached to a project.
-
-An `editor` of a **dataset** is not automatically and `editor` of the **project** it's attached to.
-
-You must be an `editor` of the Project to attach a Dataset to a project. Being an `editor` of the Dataset you are attaching does not give you the ability to detach it from the Project.
-
-You cannot add a Dataset to a Project until its upload is complete.
-
+ *
+ * Only Datasets attached to projects are available through the Project API. A Dataset that you upload is only available to others (who are not already `editors` of the data) when the Dataset is attached to a project.
+ *
+ * An `editor` of a **dataset** is not automatically and `editor` of the **project** it's attached to.
+ *
+ * You must be an `editor` of the Project to attach a Dataset to a project. Being an `editor` of the Dataset you are attaching does not give you the ability to detach it from the Project.
+ *
+ * You cannot add a Dataset to a Project until its upload is complete.
  * @summary Attach a Dataset, as a File, to a Project
  */
 export const attachFile = (
@@ -1173,311 +1387,545 @@ export const attachFile = (
   );
 };
 
-export const getAttachFileMutationOptions = <
+export const getAttachFileQueryKey = (filePostBodyBody?: FilePostBodyBody) => {
+  return ["data-manager", "POST", "file", filePostBodyBody] as const;
+};
+
+export const getAttachFileQueryOptions = <
+  TData = Awaited<ReturnType<typeof attachFile>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof attachFile>>,
-    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 ?? {};
+>(
+  filePostBodyBody: FilePostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof attachFile>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return attachFile(data, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getAttachFileQueryKey(filePostBodyBody);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof attachFile>>> = ({ signal }) =>
+    attachFile(filePostBodyBody, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof attachFile>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type AttachFileMutationResult = NonNullable<Awaited<ReturnType<typeof attachFile>>>;
-export type AttachFileMutationBody = FilePostBodyBody;
-export type AttachFileMutationError = ErrorType<void | DmError>;
+export type AttachFileQueryResult = NonNullable<Awaited<ReturnType<typeof attachFile>>>;
+export type AttachFileQueryError = 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 const useAttachFile = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAttachFile<
+  TData = Awaited<ReturnType<typeof attachFile>>,
+  TError = ErrorType<void | DmError>,
+>(
+  filePostBodyBody: FilePostBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof attachFile>>,
-      TError,
-      { data: FilePostBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof attachFile>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof attachFile>>,
-  TError,
-  { data: FilePostBodyBody },
-  TContext
-> => {
-  const mutationOptions = getAttachFileMutationOptions(options);
+): 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 };
+}
 
-  return useMutation(mutationOptions, queryClient);
-};
 /**
- * Removes an unmanaged file from a Project. You cannot use this endpoint to delete managed project files.
+ * @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,
+  );
 
-You must be an `editor` of the Project to delete a file from a Project.
+  return queryClient;
+};
 
+/**
+ * Removes an unmanaged file from a Project. You cannot use this endpoint to delete managed project files.
+ *
+ * You must be an `editor` of the Project to delete a file from a Project.
  * @summary Delete an unmanaged Project File
  */
 export const deleteUnmanagedFile = (
   params: DeleteUnmanagedFileParams,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<void>({ url: `/file`, method: "DELETE", params }, options);
+  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 getDeleteUnmanagedFileMutationOptions = <
+export const getDeleteUnmanagedFileQueryOptions = <
+  TData = Awaited<ReturnType<typeof deleteUnmanagedFile>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteUnmanagedFile>>,
-    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 ?? {};
+>(
+  params: DeleteUnmanagedFileParams,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteUnmanagedFile>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return deleteUnmanagedFile(params, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getDeleteUnmanagedFileQueryKey(params);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteUnmanagedFile>>> = ({ signal }) =>
+    deleteUnmanagedFile(params, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof deleteUnmanagedFile>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type DeleteUnmanagedFileMutationResult = NonNullable<
+export type DeleteUnmanagedFileQueryResult = NonNullable<
   Awaited<ReturnType<typeof deleteUnmanagedFile>>
 >;
+export type DeleteUnmanagedFileQueryError = ErrorType<void | DmError>;
 
-export type DeleteUnmanagedFileMutationError = 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> };
 /**
  * @summary Delete an unmanaged Project File
  */
-export const useDeleteUnmanagedFile = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useDeleteUnmanagedFile<
+  TData = Awaited<ReturnType<typeof deleteUnmanagedFile>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: DeleteUnmanagedFileParams,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteUnmanagedFile>>,
-      TError,
-      { params: DeleteUnmanagedFileParams },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteUnmanagedFile>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteUnmanagedFile>>,
-  TError,
-  { params: DeleteUnmanagedFileParams },
-  TContext
-> => {
-  const mutationOptions = getDeleteUnmanagedFileMutationOptions(options);
+): 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 };
+}
 
-  return useMutation(mutationOptions, queryClient);
-};
 /**
- * Move an **Unmanaged** file, optionally renaming it, to a new path.
+ * @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,
+  );
 
-You must be an `editor` of the project
+  return queryClient;
+};
 
+/**
+ * Move an **Unmanaged** file, optionally renaming it, to a new path.
+ *
+ * You must be an `editor` of the project
  * @summary Move an unmanaged file in a Project
  */
 export const moveFileInProject = (
   params: MoveFileInProjectParams,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<void>({ url: `/file/move`, method: "PUT", params }, options);
+  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 getMoveFileInProjectMutationOptions = <
+export const getMoveFileInProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof moveFileInProject>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof moveFileInProject>>,
-    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 ?? {};
+>(
+  params: MoveFileInProjectParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof moveFileInProject>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return moveFileInProject(params, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getMoveFileInProjectQueryKey(params);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof moveFileInProject>>> = ({ signal }) =>
+    moveFileInProject(params, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof moveFileInProject>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type MoveFileInProjectMutationResult = NonNullable<
+export type MoveFileInProjectQueryResult = NonNullable<
   Awaited<ReturnType<typeof moveFileInProject>>
 >;
+export type MoveFileInProjectQueryError = ErrorType<void | DmError>;
 
-export type MoveFileInProjectMutationError = 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> };
 /**
  * @summary Move an unmanaged file in a Project
  */
-export const useMoveFileInProject = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useMoveFileInProject<
+  TData = Awaited<ReturnType<typeof moveFileInProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: MoveFileInProjectParams,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof moveFileInProject>>,
-      TError,
-      { params: MoveFileInProjectParams },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof moveFileInProject>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof moveFileInProject>>,
-  TError,
-  { params: MoveFileInProjectParams },
-  TContext
-> => {
-  const mutationOptions = getMoveFileInProjectMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getMoveFileInProjectQueryOptions(params, options);
 
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Given a `file_id` the file will be removed from the Project it's attached to.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-You must be an `editor` of the project to delete a file from a Project. Being an `editor` of the original Dataset does not give you the ability to detach it from the Project.
+/**
+ * @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);
 
-You cannot delete a Project File until the attach is complete.
+  return queryClient;
+};
 
+/**
+ * Given a `file_id` the file will be removed from the Project it's attached to.
+ *
+ * You must be an `editor` of the project to delete a file from a Project. Being an `editor` of the original Dataset does not give you the ability to detach it from the Project.
+ *
+ * You cannot delete a Project File until the attach is complete.
  * @summary Delete/detach a File (from a Project)
  */
-export const deleteFile = (fileId: string, options?: SecondParameter<typeof customInstance>) => {
-  return customInstance<void>({ url: `/file/${fileId}`, method: "DELETE" }, options);
+export const deleteFile = (
+  fileId: string,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
+) => {
+  return customInstance<void>({ url: `/file/${fileId}`, method: "DELETE", signal }, options);
 };
 
-export const getDeleteFileMutationOptions = <
+export const getDeleteFileQueryKey = (fileId: string) => {
+  return ["data-manager", "DELETE", "file", fileId] as const;
+};
+
+export const getDeleteFileQueryOptions = <
+  TData = Awaited<ReturnType<typeof deleteFile>>,
   TError = ErrorType<void | DmError>,
-  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);
-  };
+>(
+  fileId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteFile>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
-};
+  const queryKey = queryOptions?.queryKey ?? getDeleteFileQueryKey(fileId);
 
-export type DeleteFileMutationResult = NonNullable<Awaited<ReturnType<typeof deleteFile>>>;
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteFile>>> = ({ signal }) =>
+    deleteFile(fileId, requestOptions, signal);
 
-export type DeleteFileMutationError = ErrorType<void | DmError>;
+  return {
+    queryKey,
+    queryFn,
+    enabled: fileId !== null && fileId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof deleteFile>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+};
+
+export type DeleteFileQueryResult = NonNullable<Awaited<ReturnType<typeof deleteFile>>>;
+export type DeleteFileQueryError = 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 const useDeleteFile = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useDeleteFile<
+  TData = Awaited<ReturnType<typeof deleteFile>>,
+  TError = ErrorType<void | DmError>,
+>(
+  fileId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteFile>>,
-      TError,
-      { fileId: string },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteFile>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteFile>>,
-  TError,
-  { fileId: string },
-  TContext
-> => {
-  const mutationOptions = getDeleteFileMutationOptions(options);
+): 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 };
+}
 
-  return useMutation(mutationOptions, queryClient);
-};
 /**
- * Given a `file_id` the file will be returned if available.
+ * @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);
 
-You cannot get a Project File until the attach is complete.
+  return queryClient;
+};
 
+/**
+ * Given a `file_id` the file will be returned if available.
+ *
+ * You cannot get a Project File until the attach is complete.
  * @summary Download a File (from a project)
  */
 export const downloadFile = (
@@ -1488,7 +1936,7 @@ export const downloadFile = (
   return customInstance<void>({ url: `/file/${fileId}`, method: "GET", signal }, options);
 };
 
-export const getDownloadFileQueryKey = (fileId?: string) => {
+export const getDownloadFileQueryKey = (fileId: string) => {
   return ["data-manager", "file", fileId] as const;
 };
 
@@ -1509,11 +1957,14 @@ export const getDownloadFileQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof downloadFile>>> = ({ signal }) =>
     downloadFile(fileId, requestOptions, signal);
 
-  return { queryKey, queryFn, enabled: !!fileId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof downloadFile>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: fileId !== null && fileId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof downloadFile>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type DownloadFileQueryResult = NonNullable<Awaited<ReturnType<typeof downloadFile>>>;
@@ -1537,7 +1988,7 @@ export function useDownloadFile<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useDownloadFile<
   TData = Awaited<ReturnType<typeof downloadFile>>,
   TError = ErrorType<void | DmError>,
@@ -1556,7 +2007,7 @@ export function useDownloadFile<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useDownloadFile<
   TData = Awaited<ReturnType<typeof downloadFile>>,
   TError = ErrorType<void | DmError>,
@@ -1567,7 +2018,7 @@ export function useDownloadFile<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Download a File (from a project)
  */
@@ -1582,16 +2033,14 @@ export function useDownloadFile<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getDownloadFileQueryOptions(fileId, 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 };
 }
 
 /**
@@ -1630,7 +2079,7 @@ export const getDownloadFileSuspenseQueryOptions = <
     Awaited<ReturnType<typeof downloadFile>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type DownloadFileSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof downloadFile>>>;
@@ -1648,7 +2097,7 @@ export function useDownloadFileSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useDownloadFileSuspense<
   TData = Awaited<ReturnType<typeof downloadFile>>,
   TError = ErrorType<void | DmError>,
@@ -1661,7 +2110,7 @@ export function useDownloadFileSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useDownloadFileSuspense<
   TData = Awaited<ReturnType<typeof downloadFile>>,
   TError = ErrorType<void | DmError>,
@@ -1674,7 +2123,7 @@ export function useDownloadFileSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Download a File (from a project)
  */
@@ -1691,15 +2140,13 @@ export function useDownloadFileSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getDownloadFileSuspenseQueryOptions(fileId, 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 };
 }