@squonk/data-manager-client 6.7.0 → 6.7.2

package/src/api/task/task.fetch.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,
@@ -37,6 +40,21 @@ import type { ErrorType } from "../../custom-fetch";
 
 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;
+};
+
 export type getTasksResponse200 = { data: TasksGetResponse; status: 200 };
 
 export type getTasksResponse401 = { data: void; status: 401 };
@@ -180,7 +198,7 @@ export function useGetTasks<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -278,7 +296,7 @@ export function useGetTasksSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 export type getTaskResponse200 = { data: TaskGetResponse; status: 200 };
@@ -449,7 +467,7 @@ export function useGetTask<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -553,7 +571,7 @@ export function useGetTaskSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 export type deleteTaskResponse204 = { data: void; status: 204 };
@@ -595,122 +613,64 @@ export const deleteTask = async (
   });
 };
 
-export const getDeleteTaskQueryKey = (taskId: string) => {
-  return ["data-manager", "DELETE", "task", taskId] as const;
-};
-
-export const getDeleteTaskQueryOptions = <
-  TData = Awaited<ReturnType<typeof deleteTask>>,
+export const getDeleteTaskMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  taskId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData>>;
-    request?: SecondParameter<typeof customFetch>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getDeleteTaskQueryKey(taskId);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteTask>>> = ({ signal }) =>
-    deleteTask(taskId, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: taskId !== null && taskId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof deleteTask>>,
+    TError,
+    { taskId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customFetch>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteTask>>,
+  TError,
+  { taskId: string },
+  TContext
+> => {
+  const mutationKey = ["deleteTask"];
+  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 deleteTask>>, { taskId: string }> = (
+    props,
+  ) => {
+    const { taskId } = props ?? {};
+
+    return deleteTask(taskId, requestOptions);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type DeleteTaskQueryResult = NonNullable<Awaited<ReturnType<typeof deleteTask>>>;
-export type DeleteTaskQueryError = ErrorType<void | DmError>;
+export type DeleteTaskMutationResult = NonNullable<Awaited<ReturnType<typeof deleteTask>>>;
+
+export type DeleteTaskMutationError = ErrorType<void | DmError>;
 
-export function useDeleteTask<
-  TData = Awaited<ReturnType<typeof deleteTask>>,
-  TError = ErrorType<void | DmError>,
->(
-  taskId: string,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deleteTask>>,
-          TError,
-          Awaited<ReturnType<typeof deleteTask>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customFetch>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeleteTask<
-  TData = Awaited<ReturnType<typeof deleteTask>>,
-  TError = ErrorType<void | DmError>,
->(
-  taskId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deleteTask>>,
-          TError,
-          Awaited<ReturnType<typeof deleteTask>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customFetch>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeleteTask<
-  TData = Awaited<ReturnType<typeof deleteTask>>,
-  TError = ErrorType<void | DmError>,
->(
-  taskId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData>>;
-    request?: SecondParameter<typeof customFetch>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Task entry
  */
-
-export function useDeleteTask<
-  TData = Awaited<ReturnType<typeof deleteTask>>,
-  TError = ErrorType<void | DmError>,
->(
-  taskId: string,
+export const useDeleteTask = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteTask>>,
+      TError,
+      { taskId: string },
+      TContext
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getDeleteTaskQueryOptions(taskId, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Delete a Task entry
- */
-export const invalidateDeleteTask = async (
-  queryClient: QueryClient,
-  taskId: string,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries({ queryKey: getDeleteTaskQueryKey(taskId) }, options);
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof deleteTask>>,
+  TError,
+  { taskId: string },
+  TContext
+> => {
+  return useMutation(getDeleteTaskMutationOptions(options), queryClient);
 };

package/src/api/task/task.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,
@@ -37,6 +40,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;
+};
+
 /**
  * Returns a list of Tasks that you have access to.
  * @summary Returns a list of Tasks
@@ -150,7 +168,7 @@ export function useGetTasks<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -248,7 +266,7 @@ export function useGetTasksSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -392,7 +410,7 @@ export function useGetTask<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -496,7 +514,7 @@ export function useGetTaskSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -515,122 +533,64 @@ export const deleteTask = (
   return customInstance<void>({ url: `/task/${taskId}`, method: "DELETE", signal }, options);
 };
 
-export const getDeleteTaskQueryKey = (taskId: string) => {
-  return ["data-manager", "DELETE", "task", taskId] as const;
-};
-
-export const getDeleteTaskQueryOptions = <
-  TData = Awaited<ReturnType<typeof deleteTask>>,
+export const getDeleteTaskMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  taskId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getDeleteTaskQueryKey(taskId);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteTask>>> = ({ signal }) =>
-    deleteTask(taskId, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: taskId !== null && taskId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof deleteTask>>,
+    TError,
+    { taskId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteTask>>,
+  TError,
+  { taskId: string },
+  TContext
+> => {
+  const mutationKey = ["deleteTask"];
+  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 deleteTask>>, { taskId: string }> = (
+    props,
+  ) => {
+    const { taskId } = props ?? {};
+
+    return deleteTask(taskId, requestOptions);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type DeleteTaskQueryResult = NonNullable<Awaited<ReturnType<typeof deleteTask>>>;
-export type DeleteTaskQueryError = ErrorType<void | DmError>;
+export type DeleteTaskMutationResult = NonNullable<Awaited<ReturnType<typeof deleteTask>>>;
+
+export type DeleteTaskMutationError = ErrorType<void | DmError>;
 
-export function useDeleteTask<
-  TData = Awaited<ReturnType<typeof deleteTask>>,
-  TError = ErrorType<void | DmError>,
->(
-  taskId: string,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deleteTask>>,
-          TError,
-          Awaited<ReturnType<typeof deleteTask>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeleteTask<
-  TData = Awaited<ReturnType<typeof deleteTask>>,
-  TError = ErrorType<void | DmError>,
->(
-  taskId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof deleteTask>>,
-          TError,
-          Awaited<ReturnType<typeof deleteTask>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useDeleteTask<
-  TData = Awaited<ReturnType<typeof deleteTask>>,
-  TError = ErrorType<void | DmError>,
->(
-  taskId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Task entry
  */
-
-export function useDeleteTask<
-  TData = Awaited<ReturnType<typeof deleteTask>>,
-  TError = ErrorType<void | DmError>,
->(
-  taskId: string,
+export const useDeleteTask = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteTask>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteTask>>,
+      TError,
+      { taskId: string },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getDeleteTaskQueryOptions(taskId, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Delete a Task entry
- */
-export const invalidateDeleteTask = async (
-  queryClient: QueryClient,
-  taskId: string,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries({ queryKey: getDeleteTaskQueryKey(taskId) }, options);
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof deleteTask>>,
+  TError,
+  { taskId: string },
+  TContext
+> => {
+  return useMutation(getDeleteTaskMutationOptions(options), queryClient);
 };

package/src/api/type/type.fetch.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.
@@ -31,6 +31,21 @@ import type { ErrorType } from "../../custom-fetch";
 
 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;
+};
+
 export type getFileTypesResponse200 = { data: TypesGetResponse; status: 200 };
 
 export type getFileTypesResponse401 = { data: void; status: 401 };
@@ -150,7 +165,7 @@ export function useGetFileTypes<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -248,5 +263,5 @@ export function useGetFileTypesSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }

package/src/api/type/type.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.
@@ -31,6 +31,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;
+};
+
 /**
  * Returns the supported Dataset and File (MIME) Types
  * @summary Get the supported File Types
@@ -136,7 +151,7 @@ export function useGetFileTypes<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -234,5 +249,5 @@ export function useGetFileTypesSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }