@squonk/account-server-client 2.0.4-rc.2 → 2.0.4-rc.3

package/src/asset/asset.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.12.1 🍺
+ * Generated by orval v6.15.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -29,7 +29,6 @@ import type {
 } from "../account-server-api.schemas";
 import { customInstance } from ".././custom-instance";
 import type { ErrorType } from ".././custom-instance";
-import { queryMutator } from ".././queryMutator";
 
 // eslint-disable-next-line
 type SecondParameter<T extends (...args: any) => any> = T extends (
@@ -55,17 +54,10 @@ export const getAsset = (
   );
 };
 
-export const getGetAssetQueryKey = (params?: GetAssetParams) => [
-  `/asset`,
-  ...(params ? [params] : []),
-];
+export const getGetAssetQueryKey = (params?: GetAssetParams) =>
+  ["account-server-api", `/asset`, ...(params ? [params] : [])] as const;
 
-export type GetAssetQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getAsset>>
->;
-export type GetAssetQueryError = ErrorType<AsError | void>;
-
-export const useGetAsset = <
+export const getGetAssetQueryOptions = <
   TData = Awaited<ReturnType<typeof getAsset>>,
   TError = ErrorType<AsError | void>
 >(
@@ -78,7 +70,9 @@ export const useGetAsset = <
     >;
     request?: SecondParameter<typeof customInstance>;
   }
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+): UseQueryOptions<Awaited<ReturnType<typeof getAsset>>, TError, TData> & {
+  queryKey: QueryKey;
+} => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey = queryOptions?.queryKey ?? getGetAssetQueryKey(params);
@@ -87,13 +81,35 @@ export const useGetAsset = <
     signal,
   }) => getAsset(params, requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+  return { queryKey, queryFn, ...queryOptions };
+};
 
-  const query = useQuery<Awaited<ReturnType<typeof getAsset>>, TError, TData>(
-    customOptions
-  ) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+export type GetAssetQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getAsset>>
+>;
+export type GetAssetQueryError = ErrorType<AsError | void>;
 
-  query.queryKey = customOptions.queryKey;
+export const useGetAsset = <
+  TData = Awaited<ReturnType<typeof getAsset>>,
+  TError = ErrorType<AsError | void>
+>(
+  params?: GetAssetParams,
+  options?: {
+    query?: UseQueryOptions<
+      Awaited<ReturnType<typeof getAsset>>,
+      TError,
+      TData
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  }
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+  const queryOptions = getGetAssetQueryOptions(params, options);
+
+  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+    queryKey: QueryKey;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 };
@@ -135,13 +151,7 @@ export const createAsset = (
   );
 };
 
-export type CreateAssetMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createAsset>>
->;
-export type CreateAssetMutationBody = AssetPostBodyBody;
-export type CreateAssetMutationError = ErrorType<AsError | void>;
-
-export const useCreateAsset = <
+export const getCreateAssetMutationOptions = <
   TError = ErrorType<AsError | void>,
   TContext = unknown
 >(options?: {
@@ -152,7 +162,12 @@ export const useCreateAsset = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof createAsset>>,
+  TError,
+  { data: AssetPostBodyBody },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -164,12 +179,30 @@ export const useCreateAsset = <
     return createAsset(data, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type CreateAssetMutationResult = NonNullable<
+  Awaited<ReturnType<typeof createAsset>>
+>;
+export type CreateAssetMutationBody = AssetPostBodyBody;
+export type CreateAssetMutationError = ErrorType<AsError | void>;
+
+export const useCreateAsset = <
+  TError = ErrorType<AsError | void>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof createAsset>>,
     TError,
     { data: AssetPostBodyBody },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getCreateAssetMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Used to update or replace an existing asset's **Content** and/or its **Description**. It is important to realise that the value of Assets currently in use will not be affected by the change i.e. a **Merchant** that has obtained an Asset will continue to use the original value until the Merchant requests the asset again.
@@ -203,13 +236,7 @@ export const patchAsset = (
   );
 };
 
-export type PatchAssetMutationResult = NonNullable<
-  Awaited<ReturnType<typeof patchAsset>>
->;
-export type PatchAssetMutationBody = AssetPatchBodyBody;
-export type PatchAssetMutationError = ErrorType<AsError>;
-
-export const usePatchAsset = <
+export const getPatchAssetMutationOptions = <
   TError = ErrorType<AsError>,
   TContext = unknown
 >(options?: {
@@ -220,7 +247,12 @@ export const usePatchAsset = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof patchAsset>>,
+  TError,
+  { assetId: string; data: AssetPatchBodyBody },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -232,12 +264,30 @@ export const usePatchAsset = <
     return patchAsset(assetId, data, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type PatchAssetMutationResult = NonNullable<
+  Awaited<ReturnType<typeof patchAsset>>
+>;
+export type PatchAssetMutationBody = AssetPatchBodyBody;
+export type PatchAssetMutationError = ErrorType<AsError>;
+
+export const usePatchAsset = <
+  TError = ErrorType<AsError>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof patchAsset>>,
     TError,
     { assetId: string; data: AssetPatchBodyBody },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getPatchAssetMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Deletes a known Asset. Assets that are attached to merchants cannot be deleted
@@ -254,13 +304,7 @@ export const deleteAsset = (
   );
 };
 
-export type DeleteAssetMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteAsset>>
->;
-
-export type DeleteAssetMutationError = ErrorType<AsError>;
-
-export const useDeleteAsset = <
+export const getDeleteAssetMutationOptions = <
   TError = ErrorType<AsError>,
   TContext = unknown
 >(options?: {
@@ -271,7 +315,12 @@ export const useDeleteAsset = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteAsset>>,
+  TError,
+  { assetId: string },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -283,12 +332,30 @@ export const useDeleteAsset = <
     return deleteAsset(assetId, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type DeleteAssetMutationResult = NonNullable<
+  Awaited<ReturnType<typeof deleteAsset>>
+>;
+
+export type DeleteAssetMutationError = ErrorType<AsError>;
+
+export const useDeleteAsset = <
+  TError = ErrorType<AsError>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof deleteAsset>>,
     TError,
     { assetId: string },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getDeleteAssetMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Disables a known Asset
@@ -305,13 +372,7 @@ export const disableAsset = (
   );
 };
 
-export type DisableAssetMutationResult = NonNullable<
-  Awaited<ReturnType<typeof disableAsset>>
->;
-
-export type DisableAssetMutationError = ErrorType<AsError>;
-
-export const useDisableAsset = <
+export const getDisableAssetMutationOptions = <
   TError = ErrorType<AsError>,
   TContext = unknown
 >(options?: {
@@ -322,7 +383,12 @@ export const useDisableAsset = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof disableAsset>>,
+  TError,
+  { assetId: string },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -334,12 +400,30 @@ export const useDisableAsset = <
     return disableAsset(assetId, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type DisableAssetMutationResult = NonNullable<
+  Awaited<ReturnType<typeof disableAsset>>
+>;
+
+export type DisableAssetMutationError = ErrorType<AsError>;
+
+export const useDisableAsset = <
+  TError = ErrorType<AsError>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof disableAsset>>,
     TError,
     { assetId: string },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getDisableAssetMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Enables a known Asset
@@ -356,13 +440,7 @@ export const enableAsset = (
   );
 };
 
-export type EnableAssetMutationResult = NonNullable<
-  Awaited<ReturnType<typeof enableAsset>>
->;
-
-export type EnableAssetMutationError = ErrorType<AsError>;
-
-export const useEnableAsset = <
+export const getEnableAssetMutationOptions = <
   TError = ErrorType<AsError>,
   TContext = unknown
 >(options?: {
@@ -373,7 +451,12 @@ export const useEnableAsset = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof enableAsset>>,
+  TError,
+  { assetId: string },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -385,12 +468,30 @@ export const useEnableAsset = <
     return enableAsset(assetId, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type EnableAssetMutationResult = NonNullable<
+  Awaited<ReturnType<typeof enableAsset>>
+>;
+
+export type EnableAssetMutationError = ErrorType<AsError>;
+
+export const useEnableAsset = <
+  TError = ErrorType<AsError>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof enableAsset>>,
     TError,
     { assetId: string },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getEnableAssetMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Attaches an Asset to a merchant
@@ -408,13 +509,7 @@ export const attachAsset = (
   );
 };
 
-export type AttachAssetMutationResult = NonNullable<
-  Awaited<ReturnType<typeof attachAsset>>
->;
-
-export type AttachAssetMutationError = ErrorType<AsError>;
-
-export const useAttachAsset = <
+export const getAttachAssetMutationOptions = <
   TError = ErrorType<AsError>,
   TContext = unknown
 >(options?: {
@@ -425,7 +520,12 @@ export const useAttachAsset = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof attachAsset>>,
+  TError,
+  { assetId: string; params?: AttachAssetParams },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -437,12 +537,30 @@ export const useAttachAsset = <
     return attachAsset(assetId, params, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type AttachAssetMutationResult = NonNullable<
+  Awaited<ReturnType<typeof attachAsset>>
+>;
+
+export type AttachAssetMutationError = ErrorType<AsError>;
+
+export const useAttachAsset = <
+  TError = ErrorType<AsError>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof attachAsset>>,
     TError,
     { assetId: string; params?: AttachAssetParams },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getAttachAssetMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Detaches an Asset from a merchant
@@ -460,13 +578,7 @@ export const detachAsset = (
   );
 };
 
-export type DetachAssetMutationResult = NonNullable<
-  Awaited<ReturnType<typeof detachAsset>>
->;
-
-export type DetachAssetMutationError = ErrorType<AsError>;
-
-export const useDetachAsset = <
+export const getDetachAssetMutationOptions = <
   TError = ErrorType<AsError>,
   TContext = unknown
 >(options?: {
@@ -477,7 +589,12 @@ export const useDetachAsset = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof detachAsset>>,
+  TError,
+  { assetId: string; params?: DetachAssetParams },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -489,10 +606,28 @@ export const useDetachAsset = <
     return detachAsset(assetId, params, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type DetachAssetMutationResult = NonNullable<
+  Awaited<ReturnType<typeof detachAsset>>
+>;
+
+export type DetachAssetMutationError = ErrorType<AsError>;
+
+export const useDetachAsset = <
+  TError = ErrorType<AsError>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof detachAsset>>,
     TError,
     { assetId: string; params?: DetachAssetParams },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getDetachAssetMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };

package/src/merchant/merchant.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.12.1 🍺
+ * Generated by orval v6.15.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -22,7 +22,6 @@ import type {
 } from "../account-server-api.schemas";
 import { customInstance } from ".././custom-instance";
 import type { ErrorType } from ".././custom-instance";
-import { queryMutator } from ".././queryMutator";
 
 // eslint-disable-next-line
 type SecondParameter<T extends (...args: any) => any> = T extends (
@@ -47,14 +46,9 @@ export const getMerchants = (
   );
 };
 
-export const getGetMerchantsQueryKey = () => [`/merchant`];
+export const getGetMerchantsQueryKey = () => ["account-server-api", `/merchant`] as const;
 
-export type GetMerchantsQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getMerchants>>
->;
-export type GetMerchantsQueryError = ErrorType<AsError | void>;
-
-export const useGetMerchants = <
+export const getGetMerchantsQueryOptions = <
   TData = Awaited<ReturnType<typeof getMerchants>>,
   TError = ErrorType<AsError | void>
 >(options?: {
@@ -64,7 +58,9 @@ export const useGetMerchants = <
     TData
   >;
   request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+}): UseQueryOptions<Awaited<ReturnType<typeof getMerchants>>, TError, TData> & {
+  queryKey: QueryKey;
+} => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey = queryOptions?.queryKey ?? getGetMerchantsQueryKey();
@@ -73,15 +69,32 @@ export const useGetMerchants = <
     signal,
   }) => getMerchants(requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+  return { queryKey, queryFn, ...queryOptions };
+};
+
+export type GetMerchantsQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getMerchants>>
+>;
+export type GetMerchantsQueryError = ErrorType<AsError | void>;
 
-  const query = useQuery<
+export const useGetMerchants = <
+  TData = Awaited<ReturnType<typeof getMerchants>>,
+  TError = ErrorType<AsError | void>
+>(options?: {
+  query?: UseQueryOptions<
     Awaited<ReturnType<typeof getMerchants>>,
     TError,
     TData
-  >(customOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+  const queryOptions = getGetMerchantsQueryOptions(options);
+
+  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+    queryKey: QueryKey;
+  };
 
-  query.queryKey = customOptions.queryKey;
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 };
@@ -102,14 +115,10 @@ export const getService = (
   );
 };
 
-export const getGetServiceQueryKey = (mId: number) => [`/merchant/${mId}`];
-
-export type GetServiceQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getService>>
->;
-export type GetServiceQueryError = ErrorType<AsError | void>;
+export const getGetServiceQueryKey = (mId: number) =>
+  ["account-server-api", `/merchant/${mId}`] as const;
 
-export const useGetService = <
+export const getGetServiceQueryOptions = <
   TData = Awaited<ReturnType<typeof getService>>,
   TError = ErrorType<AsError | void>
 >(
@@ -122,7 +131,9 @@ export const useGetService = <
     >;
     request?: SecondParameter<typeof customInstance>;
   }
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+): UseQueryOptions<Awaited<ReturnType<typeof getService>>, TError, TData> & {
+  queryKey: QueryKey;
+} => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey = queryOptions?.queryKey ?? getGetServiceQueryKey(mId);
@@ -131,13 +142,35 @@ export const useGetService = <
     signal,
   }) => getService(mId, requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+  return { queryKey, queryFn, enabled: !!mId, ...queryOptions };
+};
+
+export type GetServiceQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getService>>
+>;
+export type GetServiceQueryError = ErrorType<AsError | void>;
+
+export const useGetService = <
+  TData = Awaited<ReturnType<typeof getService>>,
+  TError = ErrorType<AsError | void>
+>(
+  mId: number,
+  options?: {
+    query?: UseQueryOptions<
+      Awaited<ReturnType<typeof getService>>,
+      TError,
+      TData
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  }
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+  const queryOptions = getGetServiceQueryOptions(mId, options);
 
-  const query = useQuery<Awaited<ReturnType<typeof getService>>, TError, TData>(
-    customOptions
-  ) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+    queryKey: QueryKey;
+  };
 
-  query.queryKey = customOptions.queryKey;
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 };