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

package/src/service/service.ts

@@ -8,7 +8,6 @@ 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,
@@ -21,6 +20,7 @@ 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,47 +29,54 @@ 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 appApiServiceGet = (
-  options?: AxiosRequestConfig
-): Promise<AxiosResponse<ServicesGetResponse>> => {
-  return axios.get(`/service`, options);
+export const getServices = (
+  options?: SecondParameter<typeof customInstance>
+) => {
+  return customInstance<ServicesGetResponse>(
+    { url: `/service`, method: "get" },
+    options
+  );
 };
 
-export const getAppApiServiceGetQueryKey = () => [`/service`];
+export const getGetServicesQueryKey = () => [`/service`];
 
-export type AppApiServiceGetQueryResult = NonNullable<
-  AsyncReturnType<typeof appApiServiceGet>
+export type GetServicesQueryResult = NonNullable<
+  AsyncReturnType<typeof getServices>
 >;
-export type AppApiServiceGetQueryError = AxiosError<AsError | void>;
+export type GetServicesQueryError = ErrorType<AsError | void>;
 
-export const useAppApiServiceGet = <
-  TData = AsyncReturnType<typeof appApiServiceGet>,
-  TError = AxiosError<AsError | void>
+export const useGetServices = <
+  TData = AsyncReturnType<typeof getServices>,
+  TError = ErrorType<AsError | void>
 >(options?: {
-  query?: UseQueryOptions<
-    AsyncReturnType<typeof appApiServiceGet>,
-    TError,
-    TData
-  >;
-  axios?: AxiosRequestConfig;
+  query?: UseQueryOptions<AsyncReturnType<typeof getServices>, TError, TData>;
+  request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, axios: axiosOptions } = options || {};
+  const { query: queryOptions, request: requestOptions } = options || {};
 
-  const queryKey = queryOptions?.queryKey ?? getAppApiServiceGetQueryKey();
+  const queryKey = queryOptions?.queryKey ?? getGetServicesQueryKey();
 
-  const queryFn: QueryFunction<AsyncReturnType<typeof appApiServiceGet>> = () =>
-    appApiServiceGet(axiosOptions);
+  const queryFn: QueryFunction<AsyncReturnType<typeof getServices>> = () =>
+    getServices(requestOptions);
 
-  const query = useQuery<
-    AsyncReturnType<typeof appApiServiceGet>,
-    TError,
-    TData
-  >(queryKey, queryFn, queryOptions);
+  const query = useQuery<AsyncReturnType<typeof getServices>, TError, TData>(
+    queryKey,
+    queryFn,
+    queryOptions
+  );
 
   return {
     queryKey,
@@ -82,50 +89,45 @@ export const useAppApiServiceGet = <
 
  * @summary Gets a specific Service
  */
-export const appApiServiceGetId = (
+export const getService = (
   svcId: number,
-  options?: AxiosRequestConfig
-): Promise<AxiosResponse<ServiceGetResponse>> => {
-  return axios.get(`/service/${svcId}`, options);
+  options?: SecondParameter<typeof customInstance>
+) => {
+  return customInstance<ServiceGetResponse>(
+    { url: `/service/${svcId}`, method: "get" },
+    options
+  );
 };
 
-export const getAppApiServiceGetIdQueryKey = (svcId: number) => [
-  `/service/${svcId}`,
-];
+export const getGetServiceQueryKey = (svcId: number) => [`/service/${svcId}`];
 
-export type AppApiServiceGetIdQueryResult = NonNullable<
-  AsyncReturnType<typeof appApiServiceGetId>
+export type GetServiceQueryResult = NonNullable<
+  AsyncReturnType<typeof getService>
 >;
-export type AppApiServiceGetIdQueryError = AxiosError<AsError | void>;
+export type GetServiceQueryError = ErrorType<AsError | void>;
 
-export const useAppApiServiceGetId = <
-  TData = AsyncReturnType<typeof appApiServiceGetId>,
-  TError = AxiosError<AsError | void>
+export const useGetService = <
+  TData = AsyncReturnType<typeof getService>,
+  TError = ErrorType<AsError | void>
 >(
   svcId: number,
   options?: {
-    query?: UseQueryOptions<
-      AsyncReturnType<typeof appApiServiceGetId>,
-      TError,
-      TData
-    >;
-    axios?: AxiosRequestConfig;
+    query?: UseQueryOptions<AsyncReturnType<typeof getService>, TError, TData>;
+    request?: SecondParameter<typeof customInstance>;
   }
 ): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, axios: axiosOptions } = options || {};
+  const { query: queryOptions, request: requestOptions } = options || {};
 
-  const queryKey =
-    queryOptions?.queryKey ?? getAppApiServiceGetIdQueryKey(svcId);
+  const queryKey = queryOptions?.queryKey ?? getGetServiceQueryKey(svcId);
 
-  const queryFn: QueryFunction<
-    AsyncReturnType<typeof appApiServiceGetId>
-  > = () => appApiServiceGetId(svcId, axiosOptions);
+  const queryFn: QueryFunction<AsyncReturnType<typeof getService>> = () =>
+    getService(svcId, requestOptions);
 
-  const query = useQuery<
-    AsyncReturnType<typeof appApiServiceGetId>,
-    TError,
-    TData
-  >(queryKey, queryFn, { enabled: !!svcId, ...queryOptions });
+  const query = useQuery<AsyncReturnType<typeof getService>, TError, TData>(
+    queryKey,
+    queryFn,
+    { enabled: !!svcId, ...queryOptions }
+  );
 
   return {
     queryKey,

package/src/state/state.ts

@@ -8,7 +8,6 @@ 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,6 +19,7 @@ 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,46 +28,52 @@ 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 appApiStateGetVersion = (
-  options?: AxiosRequestConfig
-): Promise<AxiosResponse<StateGetVersionResponse>> => {
-  return axios.get(`/version`, options);
+export const getVersion = (
+  options?: SecondParameter<typeof customInstance>
+) => {
+  return customInstance<StateGetVersionResponse>(
+    { url: `/version`, method: "get" },
+    options
+  );
 };
 
-export const getAppApiStateGetVersionQueryKey = () => [`/version`];
+export const getGetVersionQueryKey = () => [`/version`];
 
-export type AppApiStateGetVersionQueryResult = NonNullable<
-  AsyncReturnType<typeof appApiStateGetVersion>
+export type GetVersionQueryResult = NonNullable<
+  AsyncReturnType<typeof getVersion>
 >;
-export type AppApiStateGetVersionQueryError = AxiosError<AsError | void>;
+export type GetVersionQueryError = ErrorType<AsError | void>;
 
-export const useAppApiStateGetVersion = <
-  TData = AsyncReturnType<typeof appApiStateGetVersion>,
-  TError = AxiosError<AsError | void>
+export const useGetVersion = <
+  TData = AsyncReturnType<typeof getVersion>,
+  TError = ErrorType<AsError | void>
 >(options?: {
-  query?: UseQueryOptions<
-    AsyncReturnType<typeof appApiStateGetVersion>,
-    TError,
-    TData
-  >;
-  axios?: AxiosRequestConfig;
+  query?: UseQueryOptions<AsyncReturnType<typeof getVersion>, TError, TData>;
+  request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, axios: axiosOptions } = options || {};
+  const { query: queryOptions, request: requestOptions } = options || {};
 
-  const queryKey = queryOptions?.queryKey ?? getAppApiStateGetVersionQueryKey();
+  const queryKey = queryOptions?.queryKey ?? getGetVersionQueryKey();
 
-  const queryFn: QueryFunction<
-    AsyncReturnType<typeof appApiStateGetVersion>
-  > = () => appApiStateGetVersion(axiosOptions);
+  const queryFn: QueryFunction<AsyncReturnType<typeof getVersion>> = () =>
+    getVersion(requestOptions);
 
-  const query = useQuery<
-    AsyncReturnType<typeof appApiStateGetVersion>,
-    TError,
-    TData
-  >(queryKey, queryFn, queryOptions);
+  const query = useQuery<AsyncReturnType<typeof getVersion>, TError, TData>(
+    queryKey,
+    queryFn,
+    queryOptions
+  );
 
   return {
     queryKey,