@squonk/data-manager-client 5.4.0 → 6.2.0

package/src/api/dataset/dataset.fetch.ts

@@ -1,26 +1,23 @@
 /**
- * Generated by orval v7.21.0 🍺
+ * Generated by orval v8.16.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
-
-A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
-
- * OpenAPI spec version: 5.4
+ *
+ * A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
+ *
+ * OpenAPI spec version: 6.2
  */
-import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
+import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
   DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   InvalidateOptions,
-  MutationFunction,
   QueryClient,
   QueryFunction,
   QueryKey,
   UndefinedInitialDataOptions,
-  UseMutationOptions,
-  UseMutationResult,
   UseQueryOptions,
   UseQueryResult,
   UseSuspenseQueryOptions,
@@ -39,22 +36,13 @@ import type {
   GetDatasetsParams,
   GetVersionsParams,
   TaskIdentity,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customFetch } from "../../custom-fetch";
 import type { ErrorType } from "../../custom-fetch";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
-/**
- * Using an unmanaged file in a Project as a source a Dataset (or new Dataset Version) is created.
-
-The Dataset is assigned a unique identity if it has no **Parent**. If a Parent Dataset is named during the upload the uploaded file inherits the Parent's identity and is issued with a new unique Version number within the Dataset.
-
-Behaves like the corresponding **POST** method except the file is expected to exist on a Project path.
-
- * @summary Create a Dataset from a file in a Project
- */
 export type createDatasetFromFileResponse201 = { data: DatasetPutPostResponse; status: 201 };
 
 export type createDatasetFromFileResponse401 = { data: void; status: 401 };
@@ -80,6 +68,14 @@ export const getCreateDatasetFromFileUrl = () => {
   return `/dataset`;
 };
 
+/**
+ * Using an unmanaged file in a Project as a source a Dataset (or new Dataset Version) is created.
+ *
+ * The Dataset is assigned a unique identity if it has no **Parent**. If a Parent Dataset is named during the upload the uploaded file inherits the Parent's identity and is issued with a new unique Version number within the Dataset.
+ *
+ * Behaves like the corresponding **POST** method except the file is expected to exist on a Project path.
+ * @summary Create a Dataset from a file in a Project
+ */
 export const createDatasetFromFile = async (
   datasetPutBodyBody: DatasetPutBodyBody,
   options?: RequestInit,
@@ -110,85 +106,138 @@ export const createDatasetFromFile = async (
   });
 };
 
-export const getCreateDatasetFromFileMutationOptions = <
+export const getCreateDatasetFromFileQueryKey = (datasetPutBodyBody?: DatasetPutBodyBody) => {
+  return ["data-manager", "PUT", "dataset", datasetPutBodyBody] as const;
+};
+
+export const getCreateDatasetFromFileQueryOptions = <
+  TData = Awaited<ReturnType<typeof createDatasetFromFile>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createDatasetFromFile>>,
-    TError,
-    { data: DatasetPutBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): 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 ?? {};
+>(
+  datasetPutBodyBody: DatasetPutBodyBody,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof createDatasetFromFile>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return createDatasetFromFile(data, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getCreateDatasetFromFileQueryKey(datasetPutBodyBody);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof createDatasetFromFile>>> = ({ signal }) =>
+    createDatasetFromFile(datasetPutBodyBody, { signal, ...requestOptions });
+
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof createDatasetFromFile>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type CreateDatasetFromFileMutationResult = NonNullable<
+export type CreateDatasetFromFileQueryResult = NonNullable<
   Awaited<ReturnType<typeof createDatasetFromFile>>
 >;
-export type CreateDatasetFromFileMutationBody = DatasetPutBodyBody;
-export type CreateDatasetFromFileMutationError = ErrorType<void | DmError>;
+export type CreateDatasetFromFileQueryError = 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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Create a Dataset from a file in a Project
  */
-export const useCreateDatasetFromFile = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useCreateDatasetFromFile<
+  TData = Awaited<ReturnType<typeof createDatasetFromFile>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetPutBodyBody: DatasetPutBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createDatasetFromFile>>,
-      TError,
-      { data: DatasetPutBodyBody },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof createDatasetFromFile>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createDatasetFromFile>>,
-  TError,
-  { data: DatasetPutBodyBody },
-  TContext
-> => {
-  const mutationOptions = getCreateDatasetFromFileMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Uploads a dataset.
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getCreateDatasetFromFileQueryOptions(datasetPutBodyBody, options);
 
-Dataset file-naming is strictly limited to a fixed set of extensions based on the Dataset **Type**. You can obtain the supported types (and their extensions) via the `/type` endpoint. Filenames that do not comply with the supported filename extensions will be rejected.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-Datasets can be uploaded in an uncompressed form, or uploaded pre-compressed using the `.gz` extension.
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-The Dataset is assigned a unique identity if it has no **Parent**. If a Parent dataset is named during the upload the uploaded file inherits the Parent's identity and is issued with a new unique version number within the Dataset.
+/**
+ * @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,
+  );
 
-Datasets undergo some processing in an asynchronous **Task** after control returns to you. The unique identity of the assigned task (the `task id`) is presented to you in this endpoint's response. Before you can use an uploaded dataset, and before the dataset can be added to any pre-assigned projects, you must wait until the task is complete by making regular calls to the `/task/{task-id}` endpoint. A Dataset upload is complete when the corresponding `task.done` is **true** along with a `task.exit_code` of **0**. If the Dataset upload fails `task.done` will be **true** but the `task.exit_code` will be non-zero.
+  return queryClient;
+};
 
- * @summary Upload an external file as a Dataset
- */
 export type uploadDatasetResponse201 = { data: DatasetPutPostResponse; status: 201 };
 
 export type uploadDatasetResponse401 = { data: void; status: 401 };
@@ -210,6 +259,18 @@ export const getUploadDatasetUrl = () => {
   return `/dataset`;
 };
 
+/**
+ * Uploads a dataset.
+ *
+ * Dataset file-naming is strictly limited to a fixed set of extensions based on the Dataset **Type**. You can obtain the supported types (and their extensions) via the `/type` endpoint. Filenames that do not comply with the supported filename extensions will be rejected.
+ *
+ * Datasets can be uploaded in an uncompressed form, or uploaded pre-compressed using the `.gz` extension.
+ *
+ * The Dataset is assigned a unique identity if it has no **Parent**. If a Parent dataset is named during the upload the uploaded file inherits the Parent's identity and is issued with a new unique version number within the Dataset.
+ *
+ * Datasets undergo some processing in an asynchronous **Task** after control returns to you. The unique identity of the assigned task (the `task id`) is presented to you in this endpoint's response. Before you can use an uploaded dataset, and before the dataset can be added to any pre-assigned projects, you must wait until the task is complete by making regular calls to the `/task/{task-id}` endpoint. A Dataset upload is complete when the corresponding `task.done` is **true** along with a `task.exit_code` of **0**. If the Dataset upload fails `task.done` will be **true** but the `task.exit_code` will be non-zero.
+ * @summary Upload an external file as a Dataset
+ */
 export const uploadDataset = async (
   datasetPostBodyBody: DatasetPostBodyBody,
   options?: RequestInit,
@@ -238,81 +299,126 @@ export const uploadDataset = async (
   });
 };
 
-export const getUploadDatasetMutationOptions = <
+export const getUploadDatasetQueryKey = (datasetPostBodyBody?: DatasetPostBodyBody) => {
+  return ["data-manager", "POST", "dataset", datasetPostBodyBody] as const;
+};
+
+export const getUploadDatasetQueryOptions = <
+  TData = Awaited<ReturnType<typeof uploadDataset>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof uploadDataset>>,
-    TError,
-    { data: DatasetPostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): 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 ?? {};
+>(
+  datasetPostBodyBody: DatasetPostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof uploadDataset>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return uploadDataset(data, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getUploadDatasetQueryKey(datasetPostBodyBody);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof uploadDataset>>> = ({ signal }) =>
+    uploadDataset(datasetPostBodyBody, { signal, ...requestOptions });
+
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof uploadDataset>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type UploadDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof uploadDataset>>>;
-export type UploadDatasetMutationBody = DatasetPostBodyBody;
-export type UploadDatasetMutationError = ErrorType<void | DmError>;
+export type UploadDatasetQueryResult = NonNullable<Awaited<ReturnType<typeof uploadDataset>>>;
+export type UploadDatasetQueryError = 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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Upload an external file as a Dataset
  */
-export const useUploadDataset = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useUploadDataset<
+  TData = Awaited<ReturnType<typeof uploadDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetPostBodyBody: DatasetPostBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof uploadDataset>>,
-      TError,
-      { data: DatasetPostBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof uploadDataset>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof uploadDataset>>,
-  TError,
-  { data: DatasetPostBodyBody },
-  TContext
-> => {
-  const mutationOptions = getUploadDatasetMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Returns datasets that you have access to, whether attached to a project or not.
-
-You will not see Datasets while their upload is still in progress.
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getUploadDatasetQueryOptions(datasetPostBodyBody, options);
 
-Datasets can be filtered by the `owner username`, `mime_type`, a list of `owners`, a list of `editors`, `Labels` or `Label/Value` pairs.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-Note that if `editors` are combined with `owner username`, then the datasets will be filtered by owner username first followed by editors (so it's an AND). If `editors` are combined with `owners`, then the result will be datasets filtered by a combination of owners OR editors.
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
- * @summary Get Datasets that are available to you
+/**
+ * @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;
+};
+
 export type getDatasetsResponse200 = { data: DatasetsGetResponse; status: 200 };
 
 export type getDatasetsResponse401 = { data: void; status: 401 };
@@ -335,7 +441,7 @@ export const getGetDatasetsUrl = (params?: GetDatasetsParams) => {
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -344,6 +450,16 @@ export const getGetDatasetsUrl = (params?: GetDatasetsParams) => {
   return stringifiedParams.length > 0 ? `/dataset?${stringifiedParams}` : `/dataset`;
 };
 
+/**
+ * Returns datasets that you have access to, whether attached to a project or not.
+ *
+ * You will not see Datasets while their upload is still in progress.
+ *
+ * Datasets can be filtered by the `owner username`, `mime_type`, a list of `owners`, a list of `editors`, `Labels` or `Label/Value` pairs.
+ *
+ * Note that if `editors` are combined with `owner username`, then the datasets will be filtered by owner username first followed by editors (so it's an AND). If `editors` are combined with `owners`, then the result will be datasets filtered by a combination of owners OR editors.
+ * @summary Get Datasets that are available to you
+ */
 export const getDatasets = async (
   params?: GetDatasetsParams,
   options?: RequestInit,
@@ -376,7 +492,7 @@ export const getGetDatasetsQueryOptions = <
     Awaited<ReturnType<typeof getDatasets>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetDatasetsQueryResult = NonNullable<Awaited<ReturnType<typeof getDatasets>>>;
@@ -400,7 +516,7 @@ export function useGetDatasets<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetDatasets<
   TData = Awaited<ReturnType<typeof getDatasets>>,
   TError = ErrorType<void | DmError>,
@@ -419,7 +535,7 @@ export function useGetDatasets<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetDatasets<
   TData = Awaited<ReturnType<typeof getDatasets>>,
   TError = ErrorType<void | DmError>,
@@ -430,7 +546,7 @@ export function useGetDatasets<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get Datasets that are available to you
  */
@@ -445,16 +561,14 @@ export function useGetDatasets<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetDatasetsQueryOptions(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 };
 }
 
 /**
@@ -493,7 +607,7 @@ export const getGetDatasetsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getDatasets>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetDatasetsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getDatasets>>>;
@@ -509,7 +623,7 @@ export function useGetDatasetsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetDatasetsSuspense<
   TData = Awaited<ReturnType<typeof getDatasets>>,
   TError = ErrorType<void | DmError>,
@@ -522,7 +636,7 @@ export function useGetDatasetsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetDatasetsSuspense<
   TData = Awaited<ReturnType<typeof getDatasets>>,
   TError = ErrorType<void | DmError>,
@@ -535,7 +649,7 @@ export function useGetDatasetsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get Datasets that are available to you
  */
@@ -552,26 +666,17 @@ export function useGetDatasetsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetDatasetsSuspenseQueryOptions(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 };
 }
 
-/**
- * Returns a list of Dataset Versions.
-
-You will not see Datasets while their upload is still in progress.
-
- * @summary Gets all the Versions of a specific Dataset
- */
 export type getVersionsResponse200 = { data: DatasetDetail; status: 200 };
 
 export type getVersionsResponse401 = { data: void; status: 401 };
@@ -594,7 +699,7 @@ export const getGetVersionsUrl = (datasetId: string, params?: GetVersionsParams)
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -605,6 +710,12 @@ export const getGetVersionsUrl = (datasetId: string, params?: GetVersionsParams)
     : `/dataset/${datasetId}/versions`;
 };
 
+/**
+ * Returns a list of Dataset Versions.
+ *
+ * You will not see Datasets while their upload is still in progress.
+ * @summary Gets all the Versions of a specific Dataset
+ */
 export const getVersions = async (
   datasetId: string,
   params?: GetVersionsParams,
@@ -616,7 +727,7 @@ export const getVersions = async (
   });
 };
 
-export const getGetVersionsQueryKey = (datasetId?: string, params?: GetVersionsParams) => {
+export const getGetVersionsQueryKey = (datasetId: string, params?: GetVersionsParams) => {
   return ["data-manager", "dataset", datasetId, "versions", ...(params ? [params] : [])] as const;
 };
 
@@ -638,11 +749,14 @@ export const getGetVersionsQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getVersions>>> = ({ signal }) =>
     getVersions(datasetId, params, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!datasetId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getVersions>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: datasetId !== null && datasetId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getVersions>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetVersionsQueryResult = NonNullable<Awaited<ReturnType<typeof getVersions>>>;
@@ -667,7 +781,7 @@ export function useGetVersions<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetVersions<
   TData = Awaited<ReturnType<typeof getVersions>>,
   TError = ErrorType<void | DmError>,
@@ -687,7 +801,7 @@ export function useGetVersions<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetVersions<
   TData = Awaited<ReturnType<typeof getVersions>>,
   TError = ErrorType<void | DmError>,
@@ -699,7 +813,7 @@ export function useGetVersions<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all the Versions of a specific Dataset
  */
@@ -715,16 +829,14 @@ export function useGetVersions<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetVersionsQueryOptions(datasetId, 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 };
 }
 
 /**
@@ -768,7 +880,7 @@ export const getGetVersionsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getVersions>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetVersionsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getVersions>>>;
@@ -785,7 +897,7 @@ export function useGetVersionsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetVersionsSuspense<
   TData = Awaited<ReturnType<typeof getVersions>>,
   TError = ErrorType<void | DmError>,
@@ -799,7 +911,7 @@ export function useGetVersionsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetVersionsSuspense<
   TData = Awaited<ReturnType<typeof getVersions>>,
   TError = ErrorType<void | DmError>,
@@ -813,7 +925,7 @@ export function useGetVersionsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets all the Versions of a specific Dataset
  */
@@ -831,28 +943,17 @@ export function useGetVersionsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetVersionsSuspenseQueryOptions(datasetId, 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 the Dataset `id` and `version` the Dataset will be removed. The API does not prevent you removing a Dataset that's been used in a **Project**. When removed using this endpoint the Dataset is automatically detached from any and all Projects that it was attached to and any corresponding Project Files relating to the Dataset are also removed.
-
-You must be an `editor` or `owner` of the Dataset.
-
-You cannot delete a Dataset until its upload is complete.
-
- * @summary Delete a Dataset
- */
 export type deleteDatasetResponse200 = { data: TaskIdentity; status: 200 };
 
 export type deleteDatasetResponse401 = { data: void; status: 401 };
@@ -879,7 +980,7 @@ export const getDeleteDatasetUrl = (
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -890,6 +991,14 @@ export const getDeleteDatasetUrl = (
     : `/dataset/${datasetId}/${datasetVersion}`;
 };
 
+/**
+ * Given the Dataset `id` and `version` the Dataset will be removed. The API does not prevent you removing a Dataset that's been used in a **Project**. When removed using this endpoint the Dataset is automatically detached from any and all Projects that it was attached to and any corresponding Project Files relating to the Dataset are also removed.
+ *
+ * You must be an `editor` or `owner` of the Dataset.
+ *
+ * You cannot delete a Dataset until its upload is complete.
+ * @summary Delete a Dataset
+ */
 export const deleteDataset = async (
   datasetId: string,
   datasetVersion: number,
@@ -902,77 +1011,157 @@ export const deleteDataset = async (
   );
 };
 
-export const getDeleteDatasetMutationOptions = <
+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>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteDataset>>,
-    TError,
-    { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): 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);
-  };
+>(
+  datasetId: string,
+  datasetVersion: number,
+  params?: DeleteDatasetParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteDataset>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
-};
+  const queryKey =
+    queryOptions?.queryKey ?? getDeleteDatasetQueryKey(datasetId, datasetVersion, params);
 
-export type DeleteDatasetMutationResult = NonNullable<Awaited<ReturnType<typeof deleteDataset>>>;
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteDataset>>> = ({ signal }) =>
+    deleteDataset(datasetId, datasetVersion, params, { signal, ...requestOptions });
 
-export type DeleteDatasetMutationError = ErrorType<void | DmError>;
+  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>;
+  };
+};
 
+export type DeleteDatasetQueryResult = NonNullable<Awaited<ReturnType<typeof deleteDataset>>>;
+export type DeleteDatasetQueryError = 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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Dataset
  */
-export const useDeleteDataset = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useDeleteDataset<
+  TData = Awaited<ReturnType<typeof deleteDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  datasetVersion: number,
+  params?: DeleteDatasetParams,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteDataset>>,
-      TError,
-      { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteDataset>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteDataset>>,
-  TError,
-  { datasetId: string; datasetVersion: number; params?: DeleteDatasetParams },
-  TContext
-> => {
-  const mutationOptions = getDeleteDatasetMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Given a `dataset_id` the dataset will be returned if available.
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getDeleteDatasetQueryOptions(datasetId, datasetVersion, params, options);
 
-You cannot get a Dataset until its upload is complete.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
- * @summary Download a Dataset
+  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;
+};
+
 export type downloadDatasetResponse200 = { data: void; status: 200 };
 
 export type downloadDatasetResponse401 = { data: void; status: 401 };
@@ -994,6 +1183,12 @@ export const getDownloadDatasetUrl = (datasetId: string, datasetVersion: number)
   return `/dataset/${datasetId}/${datasetVersion}`;
 };
 
+/**
+ * Given a `dataset_id` the dataset will be returned if available.
+ *
+ * You cannot get a Dataset until its upload is complete.
+ * @summary Download a Dataset
+ */
 export const downloadDataset = async (
   datasetId: string,
   datasetVersion: number,
@@ -1005,7 +1200,7 @@ export const downloadDataset = async (
   });
 };
 
-export const getDownloadDatasetQueryKey = (datasetId?: string, datasetVersion?: number) => {
+export const getDownloadDatasetQueryKey = (datasetId: string, datasetVersion: number) => {
   return ["data-manager", "dataset", datasetId, datasetVersion] as const;
 };
 
@@ -1030,10 +1225,14 @@ export const getDownloadDatasetQueryOptions = <
   return {
     queryKey,
     queryFn,
-    enabled: !!(datasetId && datasetVersion),
+    enabled:
+      datasetId !== null &&
+      datasetId !== undefined &&
+      datasetVersion !== null &&
+      datasetVersion !== undefined,
     ...queryOptions,
   } as UseQueryOptions<Awaited<ReturnType<typeof downloadDataset>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 };
 
@@ -1059,7 +1258,7 @@ export function useDownloadDataset<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useDownloadDataset<
   TData = Awaited<ReturnType<typeof downloadDataset>>,
   TError = ErrorType<void | DmError>,
@@ -1079,7 +1278,7 @@ export function useDownloadDataset<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useDownloadDataset<
   TData = Awaited<ReturnType<typeof downloadDataset>>,
   TError = ErrorType<void | DmError>,
@@ -1091,7 +1290,7 @@ export function useDownloadDataset<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Download a Dataset
  */
@@ -1107,16 +1306,14 @@ export function useDownloadDataset<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getDownloadDatasetQueryOptions(datasetId, datasetVersion, 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 };
 }
 
 /**
@@ -1160,7 +1357,7 @@ export const getDownloadDatasetSuspenseQueryOptions = <
     Awaited<ReturnType<typeof downloadDataset>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type DownloadDatasetSuspenseQueryResult = NonNullable<
@@ -1181,7 +1378,7 @@ export function useDownloadDatasetSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useDownloadDatasetSuspense<
   TData = Awaited<ReturnType<typeof downloadDataset>>,
   TError = ErrorType<void | DmError>,
@@ -1195,7 +1392,7 @@ export function useDownloadDatasetSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useDownloadDatasetSuspense<
   TData = Awaited<ReturnType<typeof downloadDataset>>,
   TError = ErrorType<void | DmError>,
@@ -1209,7 +1406,7 @@ export function useDownloadDatasetSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Download a Dataset
  */
@@ -1227,28 +1424,17 @@ export function useDownloadDatasetSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getDownloadDatasetSuspenseQueryOptions(datasetId, datasetVersion, 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 is removed from the Dataset's `editor` list. The user is removed from all versions of a dataset. You can remove yourself but an `owner` (creator) will always have access to the dataset.
-
-You must be an `editor` or `owner` of the dataset.
-
-You cannot modify Dataset editors until its upload is complete.
-
- * @summary Remove a user's edit permission for a Dataset
- */
 export type removeEditorFromDatasetResponse204 = { data: void; status: 204 };
 
 export type removeEditorFromDatasetResponse400 = { data: DmError; status: 400 };
@@ -1277,6 +1463,14 @@ export const getRemoveEditorFromDatasetUrl = (datasetId: string, userId: string)
   return `/dataset/${datasetId}/editor/${userId}`;
 };
 
+/**
+ * The user is removed from the Dataset's `editor` list. The user is removed from all versions of a dataset. You can remove yourself but an `owner` (creator) will always have access to the dataset.
+ *
+ * You must be an `editor` or `owner` of the dataset.
+ *
+ * You cannot modify Dataset editors until its upload is complete.
+ * @summary Remove a user's edit permission for a Dataset
+ */
 export const removeEditorFromDataset = async (
   datasetId: string,
   userId: string,
@@ -1288,81 +1482,149 @@ export const removeEditorFromDataset = async (
   );
 };
 
-export const getRemoveEditorFromDatasetMutationOptions = <
+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>>,
   TError = ErrorType<DmError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof removeEditorFromDataset>>,
-    TError,
-    { datasetId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): 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);
-  };
+>(
+  datasetId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromDataset>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getRemoveEditorFromDatasetQueryKey(datasetId, userId);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof removeEditorFromDataset>>> = ({
+    signal,
+  }) => removeEditorFromDataset(datasetId, userId, { signal, ...requestOptions });
+
+  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>;
+  };
 };
 
-export type RemoveEditorFromDatasetMutationResult = NonNullable<
+export type RemoveEditorFromDatasetQueryResult = NonNullable<
   Awaited<ReturnType<typeof removeEditorFromDataset>>
 >;
+export type RemoveEditorFromDatasetQueryError = ErrorType<DmError | void>;
 
-export type RemoveEditorFromDatasetMutationError = 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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Remove a user's edit permission for a Dataset
  */
-export const useRemoveEditorFromDataset = <TError = ErrorType<DmError | void>, TContext = unknown>(
+
+export function useRemoveEditorFromDataset<
+  TData = Awaited<ReturnType<typeof removeEditorFromDataset>>,
+  TError = ErrorType<DmError | void>,
+>(
+  datasetId: string,
+  userId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof removeEditorFromDataset>>,
-      TError,
-      { datasetId: string; userId: string },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromDataset>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof removeEditorFromDataset>>,
-  TError,
-  { datasetId: string; userId: string },
-  TContext
-> => {
-  const mutationOptions = getRemoveEditorFromDatasetMutationOptions(options);
-
-  return useMutation(mutationOptions, 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`.
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getRemoveEditorFromDatasetQueryOptions(datasetId, userId, options);
 
-You must be an `editor` or `owner` of the dataset.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-You cannot modify Dataset editors until its upload is complete.
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
- * @summary Give a user edit permission for a Dataset
+/**
+ * @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;
+};
+
 export type addEditorToDatasetResponse201 = { data: void; status: 201 };
 
 export type addEditorToDatasetResponse401 = { data: void; status: 401 };
@@ -1388,6 +1650,14 @@ export const getAddEditorToDatasetUrl = (datasetId: string, userId: string) => {
   return `/dataset/${datasetId}/editor/${userId}`;
 };
 
+/**
+ * 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`.
+ *
+ * You must be an `editor` or `owner` of the dataset.
+ *
+ * You cannot modify Dataset editors until its upload is complete.
+ * @summary Give a user edit permission for a Dataset
+ */
 export const addEditorToDataset = async (
   datasetId: string,
   userId: string,
@@ -1399,77 +1669,140 @@ export const addEditorToDataset = async (
   });
 };
 
-export const getAddEditorToDatasetMutationOptions = <
+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>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof addEditorToDataset>>,
-    TError,
-    { datasetId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): 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);
-  };
+>(
+  datasetId: string,
+  userId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addEditorToDataset>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getAddEditorToDatasetQueryKey(datasetId, userId);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof addEditorToDataset>>> = ({ signal }) =>
+    addEditorToDataset(datasetId, userId, { signal, ...requestOptions });
+
+  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>;
+  };
 };
 
-export type AddEditorToDatasetMutationResult = NonNullable<
+export type AddEditorToDatasetQueryResult = NonNullable<
   Awaited<ReturnType<typeof addEditorToDataset>>
 >;
+export type AddEditorToDatasetQueryError = ErrorType<void | DmError>;
 
-export type AddEditorToDatasetMutationError = 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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Give a user edit permission for a Dataset
  */
-export const useAddEditorToDataset = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAddEditorToDataset<
+  TData = Awaited<ReturnType<typeof addEditorToDataset>>,
+  TError = ErrorType<void | DmError>,
+>(
+  datasetId: string,
+  userId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof addEditorToDataset>>,
-      TError,
-      { datasetId: string; userId: string },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addEditorToDataset>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof addEditorToDataset>>,
-  TError,
-  { datasetId: string; userId: string },
-  TContext
-> => {
-  const mutationOptions = getAddEditorToDatasetMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Returns the property schema for a Dataset versions in JSON format (if available).
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAddEditorToDatasetQueryOptions(datasetId, userId, options);
 
- * @summary Gets the property schema for a specific Dataset
+  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;
+};
+
 export type getSchemaResponse200 = { data: DatasetSchemaGetResponse; status: 200 };
 
 export type getSchemaResponse401 = { data: void; status: 401 };
@@ -1491,6 +1824,10 @@ export const getGetSchemaUrl = (datasetId: string, datasetVersion: number) => {
   return `/dataset/${datasetId}/schema/${datasetVersion}`;
 };
 
+/**
+ * Returns the property schema for a Dataset versions in JSON format (if available).
+ * @summary Gets the property schema for a specific Dataset
+ */
 export const getSchema = async (
   datasetId: string,
   datasetVersion: number,
@@ -1502,7 +1839,7 @@ export const getSchema = async (
   });
 };
 
-export const getGetSchemaQueryKey = (datasetId?: string, datasetVersion?: number) => {
+export const getGetSchemaQueryKey = (datasetId: string, datasetVersion: number) => {
   return ["data-manager", "dataset", datasetId, "schema", datasetVersion] as const;
 };
 
@@ -1527,10 +1864,14 @@ export const getGetSchemaQueryOptions = <
   return {
     queryKey,
     queryFn,
-    enabled: !!(datasetId && datasetVersion),
+    enabled:
+      datasetId !== null &&
+      datasetId !== undefined &&
+      datasetVersion !== null &&
+      datasetVersion !== undefined,
     ...queryOptions,
   } as UseQueryOptions<Awaited<ReturnType<typeof getSchema>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 };
 
@@ -1556,7 +1897,7 @@ export function useGetSchema<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetSchema<
   TData = Awaited<ReturnType<typeof getSchema>>,
   TError = ErrorType<void | DmError>,
@@ -1576,7 +1917,7 @@ export function useGetSchema<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetSchema<
   TData = Awaited<ReturnType<typeof getSchema>>,
   TError = ErrorType<void | DmError>,
@@ -1588,7 +1929,7 @@ export function useGetSchema<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the property schema for a specific Dataset
  */
@@ -1604,16 +1945,14 @@ export function useGetSchema<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetSchemaQueryOptions(datasetId, datasetVersion, 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 };
 }
 
 /**
@@ -1655,7 +1994,7 @@ export const getGetSchemaSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getSchema>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetSchemaSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getSchema>>>;
@@ -1672,7 +2011,7 @@ export function useGetSchemaSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetSchemaSuspense<
   TData = Awaited<ReturnType<typeof getSchema>>,
   TError = ErrorType<void | DmError>,
@@ -1684,7 +2023,7 @@ export function useGetSchemaSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetSchemaSuspense<
   TData = Awaited<ReturnType<typeof getSchema>>,
   TError = ErrorType<void | DmError>,
@@ -1696,7 +2035,7 @@ export function useGetSchemaSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the property schema for a specific Dataset
  */
@@ -1712,15 +2051,13 @@ export function useGetSchemaSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetSchemaSuspenseQueryOptions(datasetId, datasetVersion, 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 };
 }