@squonk/account-server-client 0.1.24-rc.1 → 0.1.27-rc.1

package/src/service/service.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.6.0 🍺
+ * Generated by orval v6.7.1 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -8,6 +8,7 @@ A service that provides access to the Account Server, which gives *registered* u
 
  * OpenAPI spec version: 0.1
  */
+import axios, { AxiosRequestConfig, AxiosResponse, AxiosError } from "axios";
 import {
   useQuery,
   UseQueryOptions,
@@ -20,7 +21,6 @@ import type {
   AsError,
   ServiceGetResponse,
 } 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 (
@@ -29,49 +29,47 @@ type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
   ? R
   : any;
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type SecondParameter<T extends (...args: any) => any> = T extends (
-  config: any,
-  args: infer P
-) => any
-  ? P
-  : never;
-
 /**
  * Gets services known to the Account Server
 
  * @summary Gets all Services
  */
-export const getServices = (
-  options?: SecondParameter<typeof customInstance>
-) => {
-  return customInstance<ServicesGetResponse>(
-    { url: `/service`, method: "get" },
-    options
-  );
+export const appApiServiceGet = (
+  options?: AxiosRequestConfig
+): Promise<AxiosResponse<ServicesGetResponse>> => {
+  return axios.get(`/service`, options);
 };
 
-export const getGetServicesQueryKey = () => [`/service`];
+export const getAppApiServiceGetQueryKey = () => [`/service`];
+
+export type AppApiServiceGetQueryResult = NonNullable<
+  AsyncReturnType<typeof appApiServiceGet>
+>;
+export type AppApiServiceGetQueryError = AxiosError<AsError | void>;
 
-export const useGetServices = <
-  TData = AsyncReturnType<typeof getServices>,
-  TError = ErrorType<AsError | void>
+export const useAppApiServiceGet = <
+  TData = AsyncReturnType<typeof appApiServiceGet>,
+  TError = AxiosError<AsError | void>
 >(options?: {
-  query?: UseQueryOptions<AsyncReturnType<typeof getServices>, TError, TData>;
-  request?: SecondParameter<typeof customInstance>;
+  query?: UseQueryOptions<
+    AsyncReturnType<typeof appApiServiceGet>,
+    TError,
+    TData
+  >;
+  axios?: AxiosRequestConfig;
 }): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options || {};
+  const { query: queryOptions, axios: axiosOptions } = options || {};
 
-  const queryKey = queryOptions?.queryKey ?? getGetServicesQueryKey();
+  const queryKey = queryOptions?.queryKey ?? getAppApiServiceGetQueryKey();
 
-  const queryFn: QueryFunction<AsyncReturnType<typeof getServices>> = () =>
-    getServices(requestOptions);
+  const queryFn: QueryFunction<AsyncReturnType<typeof appApiServiceGet>> = () =>
+    appApiServiceGet(axiosOptions);
 
-  const query = useQuery<AsyncReturnType<typeof getServices>, TError, TData>(
-    queryKey,
-    queryFn,
-    queryOptions
-  );
+  const query = useQuery<
+    AsyncReturnType<typeof appApiServiceGet>,
+    TError,
+    TData
+  >(queryKey, queryFn, queryOptions);
 
   return {
     queryKey,
@@ -84,40 +82,50 @@ export const useGetServices = <
 
  * @summary Gets a specific Service
  */
-export const getService = (
-  svcid: number,
-  options?: SecondParameter<typeof customInstance>
-) => {
-  return customInstance<ServiceGetResponse>(
-    { url: `/service/${svcid}`, method: "get" },
-    options
-  );
+export const appApiServiceGetId = (
+  svcId: number,
+  options?: AxiosRequestConfig
+): Promise<AxiosResponse<ServiceGetResponse>> => {
+  return axios.get(`/service/${svcId}`, options);
 };
 
-export const getGetServiceQueryKey = (svcid: number) => [`/service/${svcid}`];
+export const getAppApiServiceGetIdQueryKey = (svcId: number) => [
+  `/service/${svcId}`,
+];
+
+export type AppApiServiceGetIdQueryResult = NonNullable<
+  AsyncReturnType<typeof appApiServiceGetId>
+>;
+export type AppApiServiceGetIdQueryError = AxiosError<AsError | void>;
 
-export const useGetService = <
-  TData = AsyncReturnType<typeof getService>,
-  TError = ErrorType<AsError | void>
+export const useAppApiServiceGetId = <
+  TData = AsyncReturnType<typeof appApiServiceGetId>,
+  TError = AxiosError<AsError | void>
 >(
-  svcid: number,
+  svcId: number,
   options?: {
-    query?: UseQueryOptions<AsyncReturnType<typeof getService>, TError, TData>;
-    request?: SecondParameter<typeof customInstance>;
+    query?: UseQueryOptions<
+      AsyncReturnType<typeof appApiServiceGetId>,
+      TError,
+      TData
+    >;
+    axios?: AxiosRequestConfig;
   }
 ): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options || {};
+  const { query: queryOptions, axios: axiosOptions } = options || {};
 
-  const queryKey = queryOptions?.queryKey ?? getGetServiceQueryKey(svcid);
+  const queryKey =
+    queryOptions?.queryKey ?? getAppApiServiceGetIdQueryKey(svcId);
 
-  const queryFn: QueryFunction<AsyncReturnType<typeof getService>> = () =>
-    getService(svcid, requestOptions);
+  const queryFn: QueryFunction<
+    AsyncReturnType<typeof appApiServiceGetId>
+  > = () => appApiServiceGetId(svcId, axiosOptions);
 
-  const query = useQuery<AsyncReturnType<typeof getService>, TError, TData>(
-    queryKey,
-    queryFn,
-    { enabled: !!svcid, ...queryOptions }
-  );
+  const query = useQuery<
+    AsyncReturnType<typeof appApiServiceGetId>,
+    TError,
+    TData
+  >(queryKey, queryFn, { enabled: !!svcId, ...queryOptions });
 
   return {
     queryKey,

package/src/state/state.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.6.0 🍺
+ * Generated by orval v6.7.1 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -8,6 +8,7 @@ A service that provides access to the Account Server, which gives *registered* u
 
  * OpenAPI spec version: 0.1
  */
+import axios, { AxiosRequestConfig, AxiosResponse, AxiosError } from "axios";
 import {
   useQuery,
   UseQueryOptions,
@@ -19,7 +20,6 @@ import type {
   StateGetVersionResponse,
   AsError,
 } 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 (
@@ -28,47 +28,46 @@ type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
   ? R
   : any;
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type SecondParameter<T extends (...args: any) => any> = T extends (
-  config: any,
-  args: infer P
-) => any
-  ? P
-  : never;
-
 /**
  * @summary Gets the Account Server version
  */
-export const getVersion = (
-  options?: SecondParameter<typeof customInstance>
-) => {
-  return customInstance<StateGetVersionResponse>(
-    { url: `/version`, method: "get" },
-    options
-  );
+export const appApiStateGetVersion = (
+  options?: AxiosRequestConfig
+): Promise<AxiosResponse<StateGetVersionResponse>> => {
+  return axios.get(`/version`, options);
 };
 
-export const getGetVersionQueryKey = () => [`/version`];
+export const getAppApiStateGetVersionQueryKey = () => [`/version`];
 
-export const useGetVersion = <
-  TData = AsyncReturnType<typeof getVersion>,
-  TError = ErrorType<AsError | void>
+export type AppApiStateGetVersionQueryResult = NonNullable<
+  AsyncReturnType<typeof appApiStateGetVersion>
+>;
+export type AppApiStateGetVersionQueryError = AxiosError<AsError | void>;
+
+export const useAppApiStateGetVersion = <
+  TData = AsyncReturnType<typeof appApiStateGetVersion>,
+  TError = AxiosError<AsError | void>
 >(options?: {
-  query?: UseQueryOptions<AsyncReturnType<typeof getVersion>, TError, TData>;
-  request?: SecondParameter<typeof customInstance>;
+  query?: UseQueryOptions<
+    AsyncReturnType<typeof appApiStateGetVersion>,
+    TError,
+    TData
+  >;
+  axios?: AxiosRequestConfig;
 }): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options || {};
+  const { query: queryOptions, axios: axiosOptions } = options || {};
 
-  const queryKey = queryOptions?.queryKey ?? getGetVersionQueryKey();
+  const queryKey = queryOptions?.queryKey ?? getAppApiStateGetVersionQueryKey();
 
-  const queryFn: QueryFunction<AsyncReturnType<typeof getVersion>> = () =>
-    getVersion(requestOptions);
+  const queryFn: QueryFunction<
+    AsyncReturnType<typeof appApiStateGetVersion>
+  > = () => appApiStateGetVersion(axiosOptions);
 
-  const query = useQuery<AsyncReturnType<typeof getVersion>, TError, TData>(
-    queryKey,
-    queryFn,
-    queryOptions
-  );
+  const query = useQuery<
+    AsyncReturnType<typeof appApiStateGetVersion>,
+    TError,
+    TData
+  >(queryKey, queryFn, queryOptions);
 
   return {
     queryKey,