@squonk/data-manager-client 6.7.1 → 6.7.2

package/src/api/inventory/inventory.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 getUserInventoryResponse200 = { data: InventoryUserGetResponse; status: 200 };
 
 export type getUserInventoryResponse401 = { data: void; status: 401 };
@@ -178,7 +193,7 @@ export function useGetUserInventory<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -288,5 +303,5 @@ export function useGetUserInventorySuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }

package/src/api/inventory/inventory.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 an inventory of users, which includes Projects membership and Datasets they own. An Account Server **Unit** or **Organisation** must be provided (but not both).
  *
@@ -149,7 +164,7 @@ export function useGetUserInventory<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -259,5 +274,5 @@ export function useGetUserInventorySuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }

package/src/api/job/job.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,
@@ -43,6 +46,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 getJobsResponse200 = { data: JobsGetResponse; status: 200 };
 
 export type getJobsResponse401 = { data: DmError; status: 401 };
@@ -182,7 +200,7 @@ export function useGetJobs<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -280,7 +298,7 @@ export function useGetJobsSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 export type getJobByVersionResponse200 = { data: JobGetResponse; status: 200 };
@@ -430,7 +448,7 @@ export function useGetJobByVersion<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -540,7 +558,7 @@ export function useGetJobByVersionSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 export type getJobResponse200 = { data: JobGetResponse; status: 200 };
@@ -695,7 +713,7 @@ export function useGetJob<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -799,7 +817,7 @@ export function useGetJobSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 export type getAllJobExchangeRatesResponse200 = { data: GetAllExchangeRatesResponse; status: 200 };
@@ -963,7 +981,7 @@ export function useGetAllJobExchangeRates<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1076,7 +1094,7 @@ export function useGetAllJobExchangeRatesSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 export type setJobPricingResponse204 = { data: void; status: 204 };
@@ -1125,139 +1143,68 @@ export const setJobPricing = async (
   });
 };
 
-export const getSetJobPricingQueryKey = (
-  jobId: number,
-  exchangeRatePutBodyBody?: ExchangeRatePutBodyBody,
-) => {
-  return ["data-manager", "PUT", "job", jobId, "exchange-rate", exchangeRatePutBodyBody] as const;
-};
-
-export const getSetJobPricingQueryOptions = <
-  TData = Awaited<ReturnType<typeof setJobPricing>>,
+export const getSetJobPricingMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  jobId: number,
-  exchangeRatePutBodyBody: ExchangeRatePutBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof setJobPricing>>, TError, TData>>;
-    request?: SecondParameter<typeof customFetch>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getSetJobPricingQueryKey(jobId, exchangeRatePutBodyBody);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof setJobPricing>>> = ({ signal }) =>
-    setJobPricing(jobId, exchangeRatePutBodyBody, { signal, ...requestOptions });
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: jobId !== null && jobId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof setJobPricing>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof setJobPricing>>,
+    TError,
+    { jobId: number; data: ExchangeRatePutBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customFetch>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof setJobPricing>>,
+  TError,
+  { jobId: number; data: ExchangeRatePutBodyBody },
+  TContext
+> => {
+  const mutationKey = ["setJobPricing"];
+  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 setJobPricing>>,
+    { jobId: number; data: ExchangeRatePutBodyBody }
+  > = (props) => {
+    const { jobId, data } = props ?? {};
+
+    return setJobPricing(jobId, data, requestOptions);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type SetJobPricingQueryResult = NonNullable<Awaited<ReturnType<typeof setJobPricing>>>;
-export type SetJobPricingQueryError = ErrorType<void | DmError>;
+export type SetJobPricingMutationResult = NonNullable<Awaited<ReturnType<typeof setJobPricing>>>;
+export type SetJobPricingMutationBody = ExchangeRatePutBodyBody;
+export type SetJobPricingMutationError = ErrorType<void | DmError>;
 
-export function useSetJobPricing<
-  TData = Awaited<ReturnType<typeof setJobPricing>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobId: number,
-  exchangeRatePutBodyBody: ExchangeRatePutBodyBody,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof setJobPricing>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof setJobPricing>>,
-          TError,
-          Awaited<ReturnType<typeof setJobPricing>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customFetch>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useSetJobPricing<
-  TData = Awaited<ReturnType<typeof setJobPricing>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobId: number,
-  exchangeRatePutBodyBody: ExchangeRatePutBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof setJobPricing>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof setJobPricing>>,
-          TError,
-          Awaited<ReturnType<typeof setJobPricing>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customFetch>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useSetJobPricing<
-  TData = Awaited<ReturnType<typeof setJobPricing>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobId: number,
-  exchangeRatePutBodyBody: ExchangeRatePutBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof setJobPricing>>, TError, TData>>;
-    request?: SecondParameter<typeof customFetch>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Sets the Exchange Rate for a specific Job
  */
-
-export function useSetJobPricing<
-  TData = Awaited<ReturnType<typeof setJobPricing>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobId: number,
-  exchangeRatePutBodyBody: ExchangeRatePutBodyBody,
+export const useSetJobPricing = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof setJobPricing>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof setJobPricing>>,
+      TError,
+      { jobId: number; data: ExchangeRatePutBodyBody },
+      TContext
+    >;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getSetJobPricingQueryOptions(jobId, exchangeRatePutBodyBody, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Sets the Exchange Rate for a specific Job
- */
-export const invalidateSetJobPricing = async (
-  queryClient: QueryClient,
-  jobId: number,
-  exchangeRatePutBodyBody: ExchangeRatePutBodyBody,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getSetJobPricingQueryKey(jobId, exchangeRatePutBodyBody) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof setJobPricing>>,
+  TError,
+  { jobId: number; data: ExchangeRatePutBodyBody },
+  TContext
+> => {
+  return useMutation(getSetJobPricingMutationOptions(options), queryClient);
 };
-
 export type getJobExchangeRatesResponse200 = { data: GetExchangeRatesResponse; status: 200 };
 
 export type getJobExchangeRatesResponse401 = { data: void; status: 401 };
@@ -1431,7 +1378,7 @@ export function useGetJobExchangeRates<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1550,5 +1497,5 @@ export function useGetJobExchangeRatesSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }