@squonk/account-server-client 0.1.31 → 0.1.32-rc.1

package/src/state/state.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.7.1 🍺
+ * Generated by orval v6.8.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -21,12 +21,9 @@ import type {
 } from "../account-server-api.schemas";
 import { customInstance, ErrorType } from ".././custom-instance";
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
-  ...args: any
-) => Promise<infer R>
-  ? R
-  : any;
+export type AwaitedInput<T> = PromiseLike<T> | T;
+
+export type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type SecondParameter<T extends (...args: any) => any> = T extends (
@@ -40,10 +37,11 @@ type SecondParameter<T extends (...args: any) => any> = T extends (
  * @summary Gets the Account Server version
  */
 export const getVersion = (
-  options?: SecondParameter<typeof customInstance>
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal
 ) => {
   return customInstance<StateGetVersionResponse>(
-    { url: `/version`, method: "get" },
+    { url: `/version`, method: "get", signal },
     options
   );
 };
@@ -51,25 +49,30 @@ export const getVersion = (
 export const getGetVersionQueryKey = () => [`/version`];
 
 export type GetVersionQueryResult = NonNullable<
-  AsyncReturnType<typeof getVersion>
+  Awaited<ReturnType<typeof getVersion>>
 >;
 export type GetVersionQueryError = ErrorType<AsError | void>;
 
 export const useGetVersion = <
-  TData = AsyncReturnType<typeof getVersion>,
+  TData = Awaited<ReturnType<typeof getVersion>>,
   TError = ErrorType<AsError | void>
 >(options?: {
-  query?: UseQueryOptions<AsyncReturnType<typeof getVersion>, TError, TData>;
+  query?: UseQueryOptions<
+    Awaited<ReturnType<typeof getVersion>>,
+    TError,
+    TData
+  >;
   request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options || {};
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey = queryOptions?.queryKey ?? getGetVersionQueryKey();
 
-  const queryFn: QueryFunction<AsyncReturnType<typeof getVersion>> = () =>
-    getVersion(requestOptions);
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getVersion>>> = ({
+    signal,
+  }) => getVersion(requestOptions, signal);
 
-  const query = useQuery<AsyncReturnType<typeof getVersion>, TError, TData>(
+  const query = useQuery<Awaited<ReturnType<typeof getVersion>>, TError, TData>(
     queryKey,
     queryFn,
     queryOptions

package/src/unit/unit.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.7.1 🍺
+ * Generated by orval v6.8.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -29,12 +29,9 @@ import type {
 } from "../account-server-api.schemas";
 import { customInstance, ErrorType } from ".././custom-instance";
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
-  ...args: any
-) => Promise<infer R>
-  ? R
-  : any;
+export type AwaitedInput<T> = PromiseLike<T> | T;
+
+export type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type SecondParameter<T extends (...args: any) => any> = T extends (
@@ -51,10 +48,11 @@ type SecondParameter<T extends (...args: any) => any> = T extends (
  */
 export const getOrganisationUnits = (
   orgId: string,
-  options?: SecondParameter<typeof customInstance>
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal
 ) => {
   return customInstance<OrganisationUnitsGetResponse>(
-    { url: `/organisation/${orgId}/unit`, method: "get" },
+    { url: `/organisation/${orgId}/unit`, method: "get", signal },
     options
   );
 };
@@ -64,35 +62,35 @@ export const getGetOrganisationUnitsQueryKey = (orgId: string) => [
 ];
 
 export type GetOrganisationUnitsQueryResult = NonNullable<
-  AsyncReturnType<typeof getOrganisationUnits>
+  Awaited<ReturnType<typeof getOrganisationUnits>>
 >;
 export type GetOrganisationUnitsQueryError = ErrorType<void | AsError>;
 
 export const useGetOrganisationUnits = <
-  TData = AsyncReturnType<typeof getOrganisationUnits>,
+  TData = Awaited<ReturnType<typeof getOrganisationUnits>>,
   TError = ErrorType<void | AsError>
 >(
   orgId: string,
   options?: {
     query?: UseQueryOptions<
-      AsyncReturnType<typeof getOrganisationUnits>,
+      Awaited<ReturnType<typeof getOrganisationUnits>>,
       TError,
       TData
     >;
     request?: SecondParameter<typeof customInstance>;
   }
 ): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options || {};
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey =
     queryOptions?.queryKey ?? getGetOrganisationUnitsQueryKey(orgId);
 
   const queryFn: QueryFunction<
-    AsyncReturnType<typeof getOrganisationUnits>
-  > = () => getOrganisationUnits(orgId, requestOptions);
+    Awaited<ReturnType<typeof getOrganisationUnits>>
+  > = ({ signal }) => getOrganisationUnits(orgId, requestOptions, signal);
 
   const query = useQuery<
-    AsyncReturnType<typeof getOrganisationUnits>,
+    Awaited<ReturnType<typeof getOrganisationUnits>>,
     TError,
     TData
   >(queryKey, queryFn, { enabled: !!orgId, ...queryOptions });
@@ -125,7 +123,7 @@ export const createOrganisationUnit = (
 };
 
 export type CreateOrganisationUnitMutationResult = NonNullable<
-  AsyncReturnType<typeof createOrganisationUnit>
+  Awaited<ReturnType<typeof createOrganisationUnit>>
 >;
 export type CreateOrganisationUnitMutationBody = OrganisationUnitPostBodyBody;
 export type CreateOrganisationUnitMutationError = ErrorType<AsError | void>;
@@ -135,26 +133,26 @@ export const useCreateOrganisationUnit = <
   TContext = unknown
 >(options?: {
   mutation?: UseMutationOptions<
-    AsyncReturnType<typeof createOrganisationUnit>,
+    Awaited<ReturnType<typeof createOrganisationUnit>>,
     TError,
     { orgId: string; data: OrganisationUnitPostBodyBody },
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
 }) => {
-  const { mutation: mutationOptions, request: requestOptions } = options || {};
+  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
-    AsyncReturnType<typeof createOrganisationUnit>,
+    Awaited<ReturnType<typeof createOrganisationUnit>>,
     { orgId: string; data: OrganisationUnitPostBodyBody }
   > = (props) => {
-    const { orgId, data } = props || {};
+    const { orgId, data } = props ?? {};
 
     return createOrganisationUnit(orgId, data, requestOptions);
   };
 
   return useMutation<
-    AsyncReturnType<typeof createOrganisationUnit>,
+    Awaited<ReturnType<typeof createOrganisationUnit>>,
     TError,
     { orgId: string; data: OrganisationUnitPostBodyBody },
     TContext
@@ -168,10 +166,11 @@ export const useCreateOrganisationUnit = <
 export const getUnit = (
   orgId: string,
   unitId: string,
-  options?: SecondParameter<typeof customInstance>
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal
 ) => {
   return customInstance<UnitGetResponse>(
-    { url: `/organisation/${orgId}/unit/${unitId}`, method: "get" },
+    { url: `/organisation/${orgId}/unit/${unitId}`, method: "get", signal },
     options
   );
 };
@@ -180,28 +179,31 @@ export const getGetUnitQueryKey = (orgId: string, unitId: string) => [
   `/organisation/${orgId}/unit/${unitId}`,
 ];
 
-export type GetUnitQueryResult = NonNullable<AsyncReturnType<typeof getUnit>>;
+export type GetUnitQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getUnit>>
+>;
 export type GetUnitQueryError = ErrorType<void | AsError>;
 
 export const useGetUnit = <
-  TData = AsyncReturnType<typeof getUnit>,
+  TData = Awaited<ReturnType<typeof getUnit>>,
   TError = ErrorType<void | AsError>
 >(
   orgId: string,
   unitId: string,
   options?: {
-    query?: UseQueryOptions<AsyncReturnType<typeof getUnit>, TError, TData>;
+    query?: UseQueryOptions<Awaited<ReturnType<typeof getUnit>>, TError, TData>;
     request?: SecondParameter<typeof customInstance>;
   }
 ): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options || {};
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey = queryOptions?.queryKey ?? getGetUnitQueryKey(orgId, unitId);
 
-  const queryFn: QueryFunction<AsyncReturnType<typeof getUnit>> = () =>
-    getUnit(orgId, unitId, requestOptions);
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getUnit>>> = ({
+    signal,
+  }) => getUnit(orgId, unitId, requestOptions, signal);
 
-  const query = useQuery<AsyncReturnType<typeof getUnit>, TError, TData>(
+  const query = useQuery<Awaited<ReturnType<typeof getUnit>>, TError, TData>(
     queryKey,
     queryFn,
     { enabled: !!(orgId && unitId), ...queryOptions }
@@ -230,7 +232,7 @@ export const deleteOrganisationUnit = (
 };
 
 export type DeleteOrganisationUnitMutationResult = NonNullable<
-  AsyncReturnType<typeof deleteOrganisationUnit>
+  Awaited<ReturnType<typeof deleteOrganisationUnit>>
 >;
 
 export type DeleteOrganisationUnitMutationError = ErrorType<AsError>;
@@ -240,26 +242,26 @@ export const useDeleteOrganisationUnit = <
   TContext = unknown
 >(options?: {
   mutation?: UseMutationOptions<
-    AsyncReturnType<typeof deleteOrganisationUnit>,
+    Awaited<ReturnType<typeof deleteOrganisationUnit>>,
     TError,
     { orgId: string; unitId: string },
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
 }) => {
-  const { mutation: mutationOptions, request: requestOptions } = options || {};
+  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
-    AsyncReturnType<typeof deleteOrganisationUnit>,
+    Awaited<ReturnType<typeof deleteOrganisationUnit>>,
     { orgId: string; unitId: string }
   > = (props) => {
-    const { orgId, unitId } = props || {};
+    const { orgId, unitId } = props ?? {};
 
     return deleteOrganisationUnit(orgId, unitId, requestOptions);
   };
 
   return useMutation<
-    AsyncReturnType<typeof deleteOrganisationUnit>,
+    Awaited<ReturnType<typeof deleteOrganisationUnit>>,
     TError,
     { orgId: string; unitId: string },
     TContext
@@ -270,33 +272,39 @@ export const useDeleteOrganisationUnit = <
 
  * @summary Gets Units
  */
-export const getUnits = (options?: SecondParameter<typeof customInstance>) => {
+export const getUnits = (
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal
+) => {
   return customInstance<UnitsGetResponse>(
-    { url: `/unit`, method: "get" },
+    { url: `/unit`, method: "get", signal },
     options
   );
 };
 
 export const getGetUnitsQueryKey = () => [`/unit`];
 
-export type GetUnitsQueryResult = NonNullable<AsyncReturnType<typeof getUnits>>;
+export type GetUnitsQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getUnits>>
+>;
 export type GetUnitsQueryError = ErrorType<void | AsError>;
 
 export const useGetUnits = <
-  TData = AsyncReturnType<typeof getUnits>,
+  TData = Awaited<ReturnType<typeof getUnits>>,
   TError = ErrorType<void | AsError>
 >(options?: {
-  query?: UseQueryOptions<AsyncReturnType<typeof getUnits>, TError, TData>;
+  query?: UseQueryOptions<Awaited<ReturnType<typeof getUnits>>, TError, TData>;
   request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options || {};
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
   const queryKey = queryOptions?.queryKey ?? getGetUnitsQueryKey();
 
-  const queryFn: QueryFunction<AsyncReturnType<typeof getUnits>> = () =>
-    getUnits(requestOptions);
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getUnits>>> = ({
+    signal,
+  }) => getUnits(requestOptions, signal);
 
-  const query = useQuery<AsyncReturnType<typeof getUnits>, TError, TData>(
+  const query = useQuery<Awaited<ReturnType<typeof getUnits>>, TError, TData>(
     queryKey,
     queryFn,
     queryOptions
@@ -323,7 +331,7 @@ export const createDefaultUnit = (
 };
 
 export type CreateDefaultUnitMutationResult = NonNullable<
-  AsyncReturnType<typeof createDefaultUnit>
+  Awaited<ReturnType<typeof createDefaultUnit>>
 >;
 
 export type CreateDefaultUnitMutationError = ErrorType<AsError | void>;
@@ -334,24 +342,24 @@ export const useCreateDefaultUnit = <
   TContext = unknown
 >(options?: {
   mutation?: UseMutationOptions<
-    AsyncReturnType<typeof createDefaultUnit>,
+    Awaited<ReturnType<typeof createDefaultUnit>>,
     TError,
     TVariables,
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
 }) => {
-  const { mutation: mutationOptions, request: requestOptions } = options || {};
+  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
-    AsyncReturnType<typeof createDefaultUnit>,
+    Awaited<ReturnType<typeof createDefaultUnit>>,
     TVariables
   > = () => {
     return createDefaultUnit(requestOptions);
   };
 
   return useMutation<
-    AsyncReturnType<typeof createDefaultUnit>,
+    Awaited<ReturnType<typeof createDefaultUnit>>,
     TError,
     TVariables,
     TContext
@@ -369,7 +377,7 @@ export const deleteDefaultUnit = (
 };
 
 export type DeleteDefaultUnitMutationResult = NonNullable<
-  AsyncReturnType<typeof deleteDefaultUnit>
+  Awaited<ReturnType<typeof deleteDefaultUnit>>
 >;
 
 export type DeleteDefaultUnitMutationError = ErrorType<AsError>;
@@ -380,24 +388,24 @@ export const useDeleteDefaultUnit = <
   TContext = unknown
 >(options?: {
   mutation?: UseMutationOptions<
-    AsyncReturnType<typeof deleteDefaultUnit>,
+    Awaited<ReturnType<typeof deleteDefaultUnit>>,
     TError,
     TVariables,
     TContext
   >;
   request?: SecondParameter<typeof customInstance>;
 }) => {
-  const { mutation: mutationOptions, request: requestOptions } = options || {};
+  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
 
   const mutationFn: MutationFunction<
-    AsyncReturnType<typeof deleteDefaultUnit>,
+    Awaited<ReturnType<typeof deleteDefaultUnit>>,
     TVariables
   > = () => {
     return deleteDefaultUnit(requestOptions);
   };
 
   return useMutation<
-    AsyncReturnType<typeof deleteDefaultUnit>,
+    Awaited<ReturnType<typeof deleteDefaultUnit>>,
     TError,
     TVariables,
     TContext