@squonk/data-manager-client 6.7.0 → 6.7.2

package/src/api/dataset/dataset.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,
@@ -43,6 +46,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;
+};
+
 /**
  * Using an unmanaged file in a Project as a source a Dataset (or new Dataset Version) is created.
  *
@@ -86,138 +104,70 @@ export const createDatasetFromFile = (
   );
 };
 
-export const getCreateDatasetFromFileQueryKey = (datasetPutBodyBody?: DatasetPutBodyBody) => {
-  return ["data-manager", "PUT", "dataset", datasetPutBodyBody] as const;
-};
-
-export const getCreateDatasetFromFileQueryOptions = <
-  TData = Awaited<ReturnType<typeof createDatasetFromFile>>,
+export const getCreateDatasetFromFileMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  datasetPutBodyBody: DatasetPutBodyBody,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof createDatasetFromFile>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getCreateDatasetFromFileQueryKey(datasetPutBodyBody);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof createDatasetFromFile>>> = ({ signal }) =>
-    createDatasetFromFile(datasetPutBodyBody, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof createDatasetFromFile>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+    { data: DatasetPutBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof createDatasetFromFile>>,
+  TError,
+  { data: DatasetPutBodyBody },
+  TContext
+> => {
+  const mutationKey = ["createDatasetFromFile"];
+  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 createDatasetFromFile>>,
+    { data: DatasetPutBodyBody }
+  > = (props) => {
+    const { data } = props ?? {};
+
+    return createDatasetFromFile(data, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type CreateDatasetFromFileQueryResult = NonNullable<
+export type CreateDatasetFromFileMutationResult = NonNullable<
   Awaited<ReturnType<typeof createDatasetFromFile>>
 >;
-export type CreateDatasetFromFileQueryError = ErrorType<void | DmError>;
+export type CreateDatasetFromFileMutationBody = DatasetPutBodyBody;
+export type CreateDatasetFromFileMutationError = ErrorType<void | DmError>;
 
-export function useCreateDatasetFromFile<
-  TData = Awaited<ReturnType<typeof createDatasetFromFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetPutBodyBody: DatasetPutBodyBody,
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof createDatasetFromFile>>, TError, TData>
-    > &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof createDatasetFromFile>>,
-          TError,
-          Awaited<ReturnType<typeof createDatasetFromFile>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useCreateDatasetFromFile<
-  TData = Awaited<ReturnType<typeof createDatasetFromFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetPutBodyBody: DatasetPutBodyBody,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof createDatasetFromFile>>, TError, TData>
-    > &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof createDatasetFromFile>>,
-          TError,
-          Awaited<ReturnType<typeof createDatasetFromFile>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useCreateDatasetFromFile<
-  TData = Awaited<ReturnType<typeof createDatasetFromFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetPutBodyBody: DatasetPutBodyBody,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof createDatasetFromFile>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Create a Dataset from a file in a Project
  */
-
-export function useCreateDatasetFromFile<
-  TData = Awaited<ReturnType<typeof createDatasetFromFile>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetPutBodyBody: DatasetPutBodyBody,
+export const useCreateDatasetFromFile = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof createDatasetFromFile>>, TError, TData>
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof createDatasetFromFile>>,
+      TError,
+      { data: DatasetPutBodyBody },
+      TContext
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getCreateDatasetFromFileQueryOptions(datasetPutBodyBody, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Create a Dataset from a file in a Project
- */
-export const invalidateCreateDatasetFromFile = async (
-  queryClient: QueryClient,
-  datasetPutBodyBody: DatasetPutBodyBody,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getCreateDatasetFromFileQueryKey(datasetPutBodyBody) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof createDatasetFromFile>>,
+  TError,
+  { data: DatasetPutBodyBody },
+  TContext
+> => {
+  return useMutation(getCreateDatasetFromFileMutationOptions(options), queryClient);
 };
-
 /**
  * Uploads a dataset.
  *
@@ -264,126 +214,68 @@ export const uploadDataset = (
   );
 };
 
-export const getUploadDatasetQueryKey = (datasetPostBodyBody?: DatasetPostBodyBody) => {
-  return ["data-manager", "POST", "dataset", datasetPostBodyBody] as const;
-};
-
-export const getUploadDatasetQueryOptions = <
-  TData = Awaited<ReturnType<typeof uploadDataset>>,
+export const getUploadDatasetMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  datasetPostBodyBody: DatasetPostBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof uploadDataset>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getUploadDatasetQueryKey(datasetPostBodyBody);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof uploadDataset>>> = ({ signal }) =>
-    uploadDataset(datasetPostBodyBody, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof uploadDataset>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, TError> };
+    { data: DatasetPostBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof uploadDataset>>,
+  TError,
+  { data: DatasetPostBodyBody },
+  TContext
+> => {
+  const mutationKey = ["uploadDataset"];
+  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 uploadDataset>>,
+    { data: DatasetPostBodyBody }
+  > = (props) => {
+    const { data } = props ?? {};
+
+    return uploadDataset(data, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type UploadDatasetQueryResult = NonNullable<Awaited<ReturnType<typeof uploadDataset>>>;
-export type UploadDatasetQueryError = ErrorType<void | DmError>;
+export type UploadDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof uploadDataset>>>;
+export type UploadDatasetMutationBody = DatasetPostBodyBody;
+export type UploadDatasetMutationError = ErrorType<void | DmError>;
 
-export function useUploadDataset<
-  TData = Awaited<ReturnType<typeof uploadDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetPostBodyBody: DatasetPostBodyBody,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof uploadDataset>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof uploadDataset>>,
-          TError,
-          Awaited<ReturnType<typeof uploadDataset>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useUploadDataset<
-  TData = Awaited<ReturnType<typeof uploadDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetPostBodyBody: DatasetPostBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof uploadDataset>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof uploadDataset>>,
-          TError,
-          Awaited<ReturnType<typeof uploadDataset>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useUploadDataset<
-  TData = Awaited<ReturnType<typeof uploadDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetPostBodyBody: DatasetPostBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof uploadDataset>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Upload an external file as a Dataset
  */
-
-export function useUploadDataset<
-  TData = Awaited<ReturnType<typeof uploadDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetPostBodyBody: DatasetPostBodyBody,
+export const useUploadDataset = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof uploadDataset>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof uploadDataset>>,
+      TError,
+      { data: DatasetPostBodyBody },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getUploadDatasetQueryOptions(datasetPostBodyBody, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Upload an external file as a Dataset
- */
-export const invalidateUploadDataset = async (
-  queryClient: QueryClient,
-  datasetPostBodyBody: DatasetPostBodyBody,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getUploadDatasetQueryKey(datasetPostBodyBody) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof uploadDataset>>,
+  TError,
+  { data: DatasetPostBodyBody },
+  TContext
+> => {
+  return useMutation(getUploadDatasetMutationOptions(options), queryClient);
 };
-
 /**
  * Returns datasets that you have access to, whether attached to a project or not.
  *
@@ -506,7 +398,7 @@ export function useGetDatasets<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -612,7 +504,7 @@ export function useGetDatasetsSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -742,7 +634,7 @@ export function useGetVersions<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -857,7 +749,7 @@ export function useGetVersionsSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -881,157 +773,68 @@ export const deleteDataset = (
   );
 };
 
-export const getDeleteDatasetQueryKey = (
-  datasetId: string,
-  datasetVersion: number,
-  params?: DeleteDatasetParams,
-) => {
-  return [
-    "data-manager",
-    "DELETE",
-    "dataset",
-    datasetId,
-    datasetVersion,
-    ...(params ? [params] : []),
-  ] as const;
-};
-
-export const getDeleteDatasetQueryOptions = <
-  TData = Awaited<ReturnType<typeof deleteDataset>>,
+export const getDeleteDatasetMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  datasetId: string,
-  datasetVersion: number,
-  params?: DeleteDatasetParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteDataset>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getDeleteDatasetQueryKey(datasetId, datasetVersion, params);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteDataset>>> = ({ signal }) =>
-    deleteDataset(datasetId, datasetVersion, params, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled:
-      datasetId !== null &&
-      datasetId !== undefined &&
-      datasetVersion !== null &&
-      datasetVersion !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof deleteDataset>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof deleteDataset>>,
+    TError,
+    { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteDataset>>,
+  TError,
+  { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
+  TContext
+> => {
+  const mutationKey = ["deleteDataset"];
+  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 deleteDataset>>,
+    { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams }
+  > = (props) => {
+    const { datasetId, datasetVersion, params } = props ?? {};
+
+    return deleteDataset(datasetId, datasetVersion, params, requestOptions);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type DeleteDatasetQueryResult = NonNullable<Awaited<ReturnType<typeof deleteDataset>>>;
-export type DeleteDatasetQueryError = ErrorType<void | DmError>;
+export type DeleteDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof deleteDataset>>>;
+
+export type DeleteDatasetMutationError = ErrorType<void | DmError>;
 
-export function useDeleteDataset<
-  TData = Awaited<ReturnType<typeof deleteDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetId: string,
-  datasetVersion: number,
-  params: undefined | DeleteDatasetParams,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteDataset>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deleteDataset>>,
-          TError,
-          Awaited<ReturnType<typeof deleteDataset>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeleteDataset<
-  TData = Awaited<ReturnType<typeof deleteDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetId: string,
-  datasetVersion: number,
-  params?: DeleteDatasetParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteDataset>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deleteDataset>>,
-          TError,
-          Awaited<ReturnType<typeof deleteDataset>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeleteDataset<
-  TData = Awaited<ReturnType<typeof deleteDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetId: string,
-  datasetVersion: number,
-  params?: DeleteDatasetParams,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteDataset>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Dataset
  */
-
-export function useDeleteDataset<
-  TData = Awaited<ReturnType<typeof deleteDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetId: string,
-  datasetVersion: number,
-  params?: DeleteDatasetParams,
+export const useDeleteDataset = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteDataset>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteDataset>>,
+      TError,
+      { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getDeleteDatasetQueryOptions(datasetId, datasetVersion, params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Delete a Dataset
- */
-export const invalidateDeleteDataset = async (
-  queryClient: QueryClient,
-  datasetId: string,
-  datasetVersion: number,
-  params?: DeleteDatasetParams,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getDeleteDatasetQueryKey(datasetId, datasetVersion, params) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof deleteDataset>>,
+  TError,
+  { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
+  TContext
+> => {
+  return useMutation(getDeleteDatasetMutationOptions(options), queryClient);
 };
-
 /**
  * Given a `dataset_id` the dataset will be returned if available.
  *
@@ -1163,7 +966,7 @@ export function useDownloadDataset<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1282,7 +1085,7 @@ export function useDownloadDatasetSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1305,149 +1108,70 @@ export const removeEditorFromDataset = (
   );
 };
 
-export const getRemoveEditorFromDatasetQueryKey = (datasetId: string, userId: string) => {
-  return ["data-manager", "DELETE", "dataset", datasetId, "editor", userId] as const;
-};
-
-export const getRemoveEditorFromDatasetQueryOptions = <
-  TData = Awaited<ReturnType<typeof removeEditorFromDataset>>,
+export const getRemoveEditorFromDatasetMutationOptions = <
   TError = ErrorType<DmError | void>,
->(
-  datasetId: string,
-  userId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromDataset>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getRemoveEditorFromDatasetQueryKey(datasetId, userId);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof removeEditorFromDataset>>> = ({
-    signal,
-  }) => removeEditorFromDataset(datasetId, userId, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled:
-      datasetId !== null && datasetId !== undefined && userId !== null && userId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromDataset>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof removeEditorFromDataset>>,
+    TError,
+    { datasetId: string; userId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof removeEditorFromDataset>>,
+  TError,
+  { datasetId: string; userId: string },
+  TContext
+> => {
+  const mutationKey = ["removeEditorFromDataset"];
+  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 removeEditorFromDataset>>,
+    { datasetId: string; userId: string }
+  > = (props) => {
+    const { datasetId, userId } = props ?? {};
+
+    return removeEditorFromDataset(datasetId, userId, requestOptions);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type RemoveEditorFromDatasetQueryResult = NonNullable<
+export type RemoveEditorFromDatasetMutationResult = NonNullable<
   Awaited<ReturnType<typeof removeEditorFromDataset>>
 >;
-export type RemoveEditorFromDatasetQueryError = ErrorType<DmError | void>;
 
-export function useRemoveEditorFromDataset<
-  TData = Awaited<ReturnType<typeof removeEditorFromDataset>>,
-  TError = ErrorType<DmError | void>,
->(
-  datasetId: string,
-  userId: string,
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromDataset>>, TError, TData>
-    > &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof removeEditorFromDataset>>,
-          TError,
-          Awaited<ReturnType<typeof removeEditorFromDataset>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useRemoveEditorFromDataset<
-  TData = Awaited<ReturnType<typeof removeEditorFromDataset>>,
-  TError = ErrorType<DmError | void>,
->(
-  datasetId: string,
-  userId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromDataset>>, TError, TData>
-    > &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof removeEditorFromDataset>>,
-          TError,
-          Awaited<ReturnType<typeof removeEditorFromDataset>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useRemoveEditorFromDataset<
-  TData = Awaited<ReturnType<typeof removeEditorFromDataset>>,
-  TError = ErrorType<DmError | void>,
->(
-  datasetId: string,
-  userId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromDataset>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export type RemoveEditorFromDatasetMutationError = ErrorType<DmError | void>;
+
 /**
  * @summary Remove a user's edit permission for a Dataset
  */
-
-export function useRemoveEditorFromDataset<
-  TData = Awaited<ReturnType<typeof removeEditorFromDataset>>,
-  TError = ErrorType<DmError | void>,
->(
-  datasetId: string,
-  userId: string,
+export const useRemoveEditorFromDataset = <TError = ErrorType<DmError | void>, TContext = unknown>(
   options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromDataset>>, TError, TData>
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof removeEditorFromDataset>>,
+      TError,
+      { datasetId: string; userId: string },
+      TContext
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getRemoveEditorFromDatasetQueryOptions(datasetId, userId, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Remove a user's edit permission for a Dataset
- */
-export const invalidateRemoveEditorFromDataset = async (
-  queryClient: QueryClient,
-  datasetId: string,
-  userId: string,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getRemoveEditorFromDatasetQueryKey(datasetId, userId) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof removeEditorFromDataset>>,
+  TError,
+  { datasetId: string; userId: string },
+  TContext
+> => {
+  return useMutation(getRemoveEditorFromDatasetMutationOptions(options), queryClient);
 };
-
 /**
  * The user is added to the dataset's `editor`` list. The dataset `owner` is automatically an editor and so does not need to be added as an `editor`.
  *
@@ -1468,140 +1192,70 @@ export const addEditorToDataset = (
   );
 };
 
-export const getAddEditorToDatasetQueryKey = (datasetId: string, userId: string) => {
-  return ["data-manager", "PUT", "dataset", datasetId, "editor", userId] as const;
-};
-
-export const getAddEditorToDatasetQueryOptions = <
-  TData = Awaited<ReturnType<typeof addEditorToDataset>>,
+export const getAddEditorToDatasetMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  datasetId: string,
-  userId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addEditorToDataset>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getAddEditorToDatasetQueryKey(datasetId, userId);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof addEditorToDataset>>> = ({ signal }) =>
-    addEditorToDataset(datasetId, userId, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled:
-      datasetId !== null && datasetId !== undefined && userId !== null && userId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof addEditorToDataset>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof addEditorToDataset>>,
+    TError,
+    { datasetId: string; userId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof addEditorToDataset>>,
+  TError,
+  { datasetId: string; userId: string },
+  TContext
+> => {
+  const mutationKey = ["addEditorToDataset"];
+  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 addEditorToDataset>>,
+    { datasetId: string; userId: string }
+  > = (props) => {
+    const { datasetId, userId } = props ?? {};
+
+    return addEditorToDataset(datasetId, userId, requestOptions);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type AddEditorToDatasetQueryResult = NonNullable<
+export type AddEditorToDatasetMutationResult = NonNullable<
   Awaited<ReturnType<typeof addEditorToDataset>>
 >;
-export type AddEditorToDatasetQueryError = ErrorType<void | DmError>;
 
-export function useAddEditorToDataset<
-  TData = Awaited<ReturnType<typeof addEditorToDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetId: string,
-  userId: string,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof addEditorToDataset>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof addEditorToDataset>>,
-          TError,
-          Awaited<ReturnType<typeof addEditorToDataset>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAddEditorToDataset<
-  TData = Awaited<ReturnType<typeof addEditorToDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetId: string,
-  userId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof addEditorToDataset>>, TError, TData>
-    > &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof addEditorToDataset>>,
-          TError,
-          Awaited<ReturnType<typeof addEditorToDataset>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAddEditorToDataset<
-  TData = Awaited<ReturnType<typeof addEditorToDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetId: string,
-  userId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addEditorToDataset>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export type AddEditorToDatasetMutationError = ErrorType<void | DmError>;
+
 /**
  * @summary Give a user edit permission for a Dataset
  */
-
-export function useAddEditorToDataset<
-  TData = Awaited<ReturnType<typeof addEditorToDataset>>,
-  TError = ErrorType<void | DmError>,
->(
-  datasetId: string,
-  userId: string,
+export const useAddEditorToDataset = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addEditorToDataset>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof addEditorToDataset>>,
+      TError,
+      { datasetId: string; userId: string },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAddEditorToDatasetQueryOptions(datasetId, userId, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Give a user edit permission for a Dataset
- */
-export const invalidateAddEditorToDataset = async (
-  queryClient: QueryClient,
-  datasetId: string,
-  userId: string,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getAddEditorToDatasetQueryKey(datasetId, userId) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof addEditorToDataset>>,
+  TError,
+  { datasetId: string; userId: string },
+  TContext
+> => {
+  return useMutation(getAddEditorToDatasetMutationOptions(options), queryClient);
 };
-
 /**
  * Returns the property schema for a Dataset versions in JSON format (if available).
  * @summary Gets the property schema for a specific Dataset
@@ -1731,7 +1385,7 @@ export function useGetSchema<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1838,5 +1492,5 @@ export function useGetSchemaSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }