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

package/src/state/state.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.
@@ -21,7 +21,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 (
@@ -44,14 +43,9 @@ export const getVersion = (
   );
 };
 
-export const getGetVersionQueryKey = () => [`/version`];
+export const getGetVersionQueryKey = () => ["account-server-api", `/version`] as const;
 
-export type GetVersionQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getVersion>>
->;
-export type GetVersionQueryError = ErrorType<AsError | void>;
-
-export const useGetVersion = <
+export const getGetVersionQueryOptions = <
   TData = Awaited<ReturnType<typeof getVersion>>,
   TError = ErrorType<AsError | void>
 >(options?: {
@@ -61,7 +55,9 @@ export const useGetVersion = <
     TData
   >;
   request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+}): UseQueryOptions<Awaited<ReturnType<typeof getVersion>>, TError, TData> & {
+  queryKey: QueryKey;
+} => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey = queryOptions?.queryKey ?? getGetVersionQueryKey();
@@ -70,13 +66,32 @@ export const useGetVersion = <
     signal,
   }) => getVersion(requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+  return { queryKey, queryFn, ...queryOptions };
+};
+
+export type GetVersionQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getVersion>>
+>;
+export type GetVersionQueryError = ErrorType<AsError | void>;
+
+export const useGetVersion = <
+  TData = Awaited<ReturnType<typeof getVersion>>,
+  TError = ErrorType<AsError | void>
+>(options?: {
+  query?: UseQueryOptions<
+    Awaited<ReturnType<typeof getVersion>>,
+    TError,
+    TData
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+  const queryOptions = getGetVersionQueryOptions(options);
 
-  const query = useQuery<Awaited<ReturnType<typeof getVersion>>, 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;
 };

package/src/unit/unit.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.
@@ -32,7 +32,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 (
@@ -58,16 +57,10 @@ export const getOrganisationUnits = (
   );
 };
 
-export const getGetOrganisationUnitsQueryKey = (orgId: string) => [
-  `/organisation/${orgId}/unit`,
-];
+export const getGetOrganisationUnitsQueryKey = (orgId: string) =>
+  ["account-server-api", `/organisation/${orgId}/unit`] as const;
 
-export type GetOrganisationUnitsQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getOrganisationUnits>>
->;
-export type GetOrganisationUnitsQueryError = ErrorType<void | AsError>;
-
-export const useGetOrganisationUnits = <
+export const getGetOrganisationUnitsQueryOptions = <
   TData = Awaited<ReturnType<typeof getOrganisationUnits>>,
   TError = ErrorType<void | AsError>
 >(
@@ -80,7 +73,11 @@ export const useGetOrganisationUnits = <
     >;
     request?: SecondParameter<typeof customInstance>;
   }
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+): UseQueryOptions<
+  Awaited<ReturnType<typeof getOrganisationUnits>>,
+  TError,
+  TData
+> & { queryKey: QueryKey } => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey =
@@ -90,15 +87,35 @@ export const useGetOrganisationUnits = <
     Awaited<ReturnType<typeof getOrganisationUnits>>
   > = ({ signal }) => getOrganisationUnits(orgId, requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+  return { queryKey, queryFn, enabled: !!orgId, ...queryOptions };
+};
 
-  const query = useQuery<
-    Awaited<ReturnType<typeof getOrganisationUnits>>,
-    TError,
-    TData
-  >(customOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+export type GetOrganisationUnitsQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getOrganisationUnits>>
+>;
+export type GetOrganisationUnitsQueryError = ErrorType<void | AsError>;
+
+export const useGetOrganisationUnits = <
+  TData = Awaited<ReturnType<typeof getOrganisationUnits>>,
+  TError = ErrorType<void | AsError>
+>(
+  orgId: string,
+  options?: {
+    query?: UseQueryOptions<
+      Awaited<ReturnType<typeof getOrganisationUnits>>,
+      TError,
+      TData
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  }
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+  const queryOptions = getGetOrganisationUnitsQueryOptions(orgId, options);
+
+  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+    queryKey: QueryKey;
+  };
 
-  query.queryKey = customOptions.queryKey;
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 };
@@ -124,13 +141,7 @@ export const createOrganisationUnit = (
   );
 };
 
-export type CreateOrganisationUnitMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createOrganisationUnit>>
->;
-export type CreateOrganisationUnitMutationBody = OrganisationUnitPostBodyBody;
-export type CreateOrganisationUnitMutationError = ErrorType<AsError | void>;
-
-export const useCreateOrganisationUnit = <
+export const getCreateOrganisationUnitMutationOptions = <
   TError = ErrorType<AsError | void>,
   TContext = unknown
 >(options?: {
@@ -141,7 +152,12 @@ export const useCreateOrganisationUnit = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof createOrganisationUnit>>,
+  TError,
+  { orgId: string; data: OrganisationUnitPostBodyBody },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -153,12 +169,30 @@ export const useCreateOrganisationUnit = <
     return createOrganisationUnit(orgId, data, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type CreateOrganisationUnitMutationResult = NonNullable<
+  Awaited<ReturnType<typeof createOrganisationUnit>>
+>;
+export type CreateOrganisationUnitMutationBody = OrganisationUnitPostBodyBody;
+export type CreateOrganisationUnitMutationError = ErrorType<AsError | void>;
+
+export const useCreateOrganisationUnit = <
+  TError = ErrorType<AsError | void>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof createOrganisationUnit>>,
     TError,
     { orgId: string; data: OrganisationUnitPostBodyBody },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getCreateOrganisationUnitMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Gets the Unit, assuming you are a member of it or it is public. Admin users can see all Units
@@ -176,14 +210,10 @@ export const getUnit = (
   );
 };
 
-export const getGetUnitQueryKey = (unitId: string) => [`/unit/${unitId}`];
-
-export type GetUnitQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getUnit>>
->;
-export type GetUnitQueryError = ErrorType<void | AsError>;
+export const getGetUnitQueryKey = (unitId: string) =>
+  ["account-server-api", `/unit/${unitId}`] as const;
 
-export const useGetUnit = <
+export const getGetUnitQueryOptions = <
   TData = Awaited<ReturnType<typeof getUnit>>,
   TError = ErrorType<void | AsError>
 >(
@@ -192,7 +222,9 @@ export const useGetUnit = <
     query?: UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>;
     request?: SecondParameter<typeof customInstance>;
   }
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+): UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData> & {
+  queryKey: QueryKey;
+} => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey = queryOptions?.queryKey ?? getGetUnitQueryKey(unitId);
@@ -201,13 +233,31 @@ export const useGetUnit = <
     signal,
   }) => getUnit(unitId, requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+  return { queryKey, queryFn, enabled: !!unitId, ...queryOptions };
+};
+
+export type GetUnitQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getUnit>>
+>;
+export type GetUnitQueryError = ErrorType<void | AsError>;
+
+export const useGetUnit = <
+  TData = Awaited<ReturnType<typeof getUnit>>,
+  TError = ErrorType<void | AsError>
+>(
+  unitId: string,
+  options?: {
+    query?: UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>;
+    request?: SecondParameter<typeof customInstance>;
+  }
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+  const queryOptions = getGetUnitQueryOptions(unitId, options);
 
-  const query = useQuery<Awaited<ReturnType<typeof getUnit>>, 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;
 };
@@ -224,29 +274,18 @@ export const patchUnit = (
   unitPatchBodyBody: UnitPatchBodyBody,
   options?: SecondParameter<typeof customInstance>
 ) => {
-  const formData = new FormData();
-  if (unitPatchBodyBody.name !== undefined) {
-    formData.append("name", unitPatchBodyBody.name);
-  }
-
   return customInstance<void>(
     {
       url: `/unit/${unitId}`,
       method: "patch",
-      headers: { "Content-Type": "multipart/form-data" },
-      data: formData,
+      headers: { "Content-Type": "application/json" },
+      data: unitPatchBodyBody,
     },
     options
   );
 };
 
-export type PatchUnitMutationResult = NonNullable<
-  Awaited<ReturnType<typeof patchUnit>>
->;
-export type PatchUnitMutationBody = UnitPatchBodyBody;
-export type PatchUnitMutationError = ErrorType<AsError>;
-
-export const usePatchUnit = <
+export const getPatchUnitMutationOptions = <
   TError = ErrorType<AsError>,
   TContext = unknown
 >(options?: {
@@ -257,7 +296,12 @@ export const usePatchUnit = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof patchUnit>>,
+  TError,
+  { unitId: string; data: UnitPatchBodyBody },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -269,12 +313,30 @@ export const usePatchUnit = <
     return patchUnit(unitId, data, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type PatchUnitMutationResult = NonNullable<
+  Awaited<ReturnType<typeof patchUnit>>
+>;
+export type PatchUnitMutationBody = UnitPatchBodyBody;
+export type PatchUnitMutationError = ErrorType<AsError>;
+
+export const usePatchUnit = <
+  TError = ErrorType<AsError>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof patchUnit>>,
     TError,
     { unitId: string; data: UnitPatchBodyBody },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getPatchUnitMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Deletes an Organisational Unit you have access to. Units can only be deleted by Organisation users or Admin users. You cannot delete a Unit that contains Products
@@ -291,13 +353,7 @@ export const deleteOrganisationUnit = (
   );
 };
 
-export type DeleteOrganisationUnitMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteOrganisationUnit>>
->;
-
-export type DeleteOrganisationUnitMutationError = ErrorType<AsError>;
-
-export const useDeleteOrganisationUnit = <
+export const getDeleteOrganisationUnitMutationOptions = <
   TError = ErrorType<AsError>,
   TContext = unknown
 >(options?: {
@@ -308,7 +364,12 @@ export const useDeleteOrganisationUnit = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteOrganisationUnit>>,
+  TError,
+  { unitId: string },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -320,12 +381,30 @@ export const useDeleteOrganisationUnit = <
     return deleteOrganisationUnit(unitId, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type DeleteOrganisationUnitMutationResult = NonNullable<
+  Awaited<ReturnType<typeof deleteOrganisationUnit>>
+>;
+
+export type DeleteOrganisationUnitMutationError = ErrorType<AsError>;
+
+export const useDeleteOrganisationUnit = <
+  TError = ErrorType<AsError>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof deleteOrganisationUnit>>,
     TError,
     { unitId: string },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getDeleteOrganisationUnitMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Gets all the Units that are public or you are a member of. Admin users can see all Units
@@ -342,20 +421,17 @@ export const getUnits = (
   );
 };
 
-export const getGetUnitsQueryKey = () => [`/unit`];
-
-export type GetUnitsQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getUnits>>
->;
-export type GetUnitsQueryError = ErrorType<void | AsError>;
+export const getGetUnitsQueryKey = () => ["account-server-api", `/unit`] as const;
 
-export const useGetUnits = <
+export const getGetUnitsQueryOptions = <
   TData = Awaited<ReturnType<typeof getUnits>>,
   TError = ErrorType<void | AsError>
 >(options?: {
   query?: UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>;
   request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+}): UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData> & {
+  queryKey: QueryKey;
+} => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey = queryOptions?.queryKey ?? getGetUnitsQueryKey();
@@ -364,13 +440,28 @@ export const useGetUnits = <
     signal,
   }) => getUnits(requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+  return { queryKey, queryFn, ...queryOptions };
+};
 
-  const query = useQuery<Awaited<ReturnType<typeof getUnits>>, TError, TData>(
-    customOptions
-  ) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+export type GetUnitsQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getUnits>>
+>;
+export type GetUnitsQueryError = ErrorType<void | AsError>;
 
-  query.queryKey = customOptions.queryKey;
+export const useGetUnits = <
+  TData = Awaited<ReturnType<typeof getUnits>>,
+  TError = ErrorType<void | AsError>
+>(options?: {
+  query?: UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>;
+  request?: SecondParameter<typeof customInstance>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+  const queryOptions = getGetUnitsQueryOptions(options);
+
+  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+    queryKey: QueryKey;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 };
@@ -395,13 +486,7 @@ export const createDefaultUnit = (
   );
 };
 
-export type CreateDefaultUnitMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createDefaultUnit>>
->;
-export type CreateDefaultUnitMutationBody = PersonalUnitPutBodyBody;
-export type CreateDefaultUnitMutationError = ErrorType<AsError | void>;
-
-export const useCreateDefaultUnit = <
+export const getCreateDefaultUnitMutationOptions = <
   TError = ErrorType<AsError | void>,
   TContext = unknown
 >(options?: {
@@ -412,7 +497,12 @@ export const useCreateDefaultUnit = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof createDefaultUnit>>,
+  TError,
+  { data: PersonalUnitPutBodyBody },
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -424,12 +514,30 @@ export const useCreateDefaultUnit = <
     return createDefaultUnit(data, requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type CreateDefaultUnitMutationResult = NonNullable<
+  Awaited<ReturnType<typeof createDefaultUnit>>
+>;
+export type CreateDefaultUnitMutationBody = PersonalUnitPutBodyBody;
+export type CreateDefaultUnitMutationError = ErrorType<AsError | void>;
+
+export const useCreateDefaultUnit = <
+  TError = ErrorType<AsError | void>,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof createDefaultUnit>>,
     TError,
     { data: PersonalUnitPutBodyBody },
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getCreateDefaultUnitMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Deletes a 'Personal' Unit. It must be your Unit, which belongs to the Default Organisation
@@ -442,13 +550,7 @@ export const deleteDefaultUnit = (
   return customInstance<void>({ url: `/unit`, method: "delete" }, options);
 };
 
-export type DeleteDefaultUnitMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteDefaultUnit>>
->;
-
-export type DeleteDefaultUnitMutationError = ErrorType<AsError>;
-
-export const useDeleteDefaultUnit = <
+export const getDeleteDefaultUnitMutationOptions = <
   TError = ErrorType<AsError>,
   TVariables = void,
   TContext = unknown
@@ -460,7 +562,12 @@ export const useDeleteDefaultUnit = <
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
-}) => {
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteDefaultUnit>>,
+  TError,
+  TVariables,
+  TContext
+> => {
   const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
@@ -470,12 +577,31 @@ export const useDeleteDefaultUnit = <
     return deleteDefaultUnit(requestOptions);
   };
 
-  return useMutation<
+  return { mutationFn, ...mutationOptions };
+};
+
+export type DeleteDefaultUnitMutationResult = NonNullable<
+  Awaited<ReturnType<typeof deleteDefaultUnit>>
+>;
+
+export type DeleteDefaultUnitMutationError = ErrorType<AsError>;
+
+export const useDeleteDefaultUnit = <
+  TError = ErrorType<AsError>,
+  TVariables = void,
+  TContext = unknown
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof deleteDefaultUnit>>,
     TError,
     TVariables,
     TContext
-  >(mutationFn, mutationOptions);
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const mutationOptions = getDeleteDefaultUnitMutationOptions(options);
+
+  return useMutation(mutationOptions);
 };
 /**
  * Get the charges made against a Unit with optional **from** (inclusive) and **until** (exclusive) dates. If no dates are provided, the charges for the current billing period are returned.
@@ -502,14 +628,9 @@ export const getUnitCharges = (
 export const getGetUnitChargesQueryKey = (
   unitId: string,
   params?: GetUnitChargesParams
-) => [`/unit/${unitId}/charges`, ...(params ? [params] : [])];
+) => ["account-server-api", `/unit/${unitId}/charges`, ...(params ? [params] : [])] as const;
 
-export type GetUnitChargesQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getUnitCharges>>
->;
-export type GetUnitChargesQueryError = ErrorType<AsError | void>;
-
-export const useGetUnitCharges = <
+export const getGetUnitChargesQueryOptions = <
   TData = Awaited<ReturnType<typeof getUnitCharges>>,
   TError = ErrorType<AsError | void>
 >(
@@ -523,7 +644,11 @@ export const useGetUnitCharges = <
     >;
     request?: SecondParameter<typeof customInstance>;
   }
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+): UseQueryOptions<
+  Awaited<ReturnType<typeof getUnitCharges>>,
+  TError,
+  TData
+> & { queryKey: QueryKey } => {
   const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey =
@@ -533,15 +658,36 @@ export const useGetUnitCharges = <
     signal,
   }) => getUnitCharges(unitId, params, requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+  return { queryKey, queryFn, enabled: !!unitId, ...queryOptions };
+};
 
-  const query = useQuery<
-    Awaited<ReturnType<typeof getUnitCharges>>,
-    TError,
-    TData
-  >(customOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+export type GetUnitChargesQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getUnitCharges>>
+>;
+export type GetUnitChargesQueryError = ErrorType<AsError | void>;
+
+export const useGetUnitCharges = <
+  TData = Awaited<ReturnType<typeof getUnitCharges>>,
+  TError = ErrorType<AsError | void>
+>(
+  unitId: string,
+  params?: GetUnitChargesParams,
+  options?: {
+    query?: UseQueryOptions<
+      Awaited<ReturnType<typeof getUnitCharges>>,
+      TError,
+      TData
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  }
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+  const queryOptions = getGetUnitChargesQueryOptions(unitId, params, options);
+
+  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+    queryKey: QueryKey;
+  };
 
-  query.queryKey = customOptions.queryKey;
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 };