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

package/src/merchant/merchant.ts

@@ -8,25 +8,28 @@ A service that provides access to the Account Server, which gives *registered* u
 
  * OpenAPI spec version: 1.0
  */
-import { useQuery } from "react-query";
+import {
+  useQuery
+} from 'react-query'
 import type {
   UseQueryOptions,
   QueryFunction,
   UseQueryResult,
-  QueryKey,
-} from "react-query";
+  QueryKey
+} from 'react-query'
 import type {
   MerchantsGetResponse,
   AsError,
-  MerchantGetResponse,
-} from "../account-server-api.schemas";
-import { customInstance } from ".././custom-instance";
-import type { ErrorType } from ".././custom-instance";
+  MerchantGetResponse
+} from '../account-server-api.schemas'
+import { customInstance } from '.././custom-instance'
+import type { ErrorType } from '.././custom-instance'
+
 
 // eslint-disable-next-line
-type SecondParameter<T extends (...args: any) => any> = T extends (
+  type SecondParameter<T extends (...args: any) => any> = T extends (
   config: any,
-  args: infer P
+  args: infer P,
 ) => any
   ? P
   : never;
@@ -37,53 +40,41 @@ type SecondParameter<T extends (...args: any) => any> = T extends (
  * @summary Gets all Merchants
  */
 export const getMerchants = (
-  options?: SecondParameter<typeof customInstance>,
-  signal?: AbortSignal
+    
+ options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
 ) => {
-  return customInstance<MerchantsGetResponse>(
-    { url: `/merchant`, method: "get", signal },
-    options
-  );
-};
+      return customInstance<MerchantsGetResponse>(
+      {url: `/merchant`, method: 'get', signal
+    },
+      options);
+    }
+  
 
 export const getGetMerchantsQueryKey = () => [`/merchant`];
 
-export type GetMerchantsQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getMerchants>>
->;
-export type GetMerchantsQueryError = ErrorType<AsError | void>;
-
-export const useGetMerchants = <
-  TData = Awaited<ReturnType<typeof getMerchants>>,
-  TError = ErrorType<AsError | void>
->(options?: {
-  query?: UseQueryOptions<
-    Awaited<ReturnType<typeof getMerchants>>,
-    TError,
-    TData
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
+    
+export type GetMerchantsQueryResult = NonNullable<Awaited<ReturnType<typeof getMerchants>>>
+export type GetMerchantsQueryError = ErrorType<AsError | void>
+
+export const useGetMerchants = <TData = Awaited<ReturnType<typeof getMerchants>>, TError = ErrorType<AsError | void>>(
+  options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getMerchants>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
+
+  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+
+  const {query: queryOptions, request: requestOptions} = options ?? {}
 
   const queryKey = queryOptions?.queryKey ?? getGetMerchantsQueryKey();
 
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof getMerchants>>> = ({
-    signal,
-  }) => getMerchants(requestOptions, signal);
+  
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getMerchants>>> = ({ signal }) => getMerchants(requestOptions, signal);
 
-  const query = useQuery<
-    Awaited<ReturnType<typeof getMerchants>>,
-    TError,
-    TData
-  >(queryKey, queryFn, queryOptions) as UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const query = useQuery<Awaited<ReturnType<typeof getMerchants>>, TError, TData>(queryKey, queryFn, queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
 
   query.queryKey = queryKey;
 
   return query;
-};
+}
 
 /**
  * Gets a known merchant
@@ -91,52 +82,39 @@ export const useGetMerchants = <
  * @summary Gets a specific Merchant
  */
 export const getService = (
-  mId: number,
-  options?: SecondParameter<typeof customInstance>,
-  signal?: AbortSignal
+    mId: number,
+ options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
 ) => {
-  return customInstance<MerchantGetResponse>(
-    { url: `/merchant/${mId}`, method: "get", signal },
-    options
-  );
-};
-
-export const getGetServiceQueryKey = (mId: number) => [`/merchant/${mId}`];
-
-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 { query: queryOptions, request: requestOptions } = options ?? {};
+      return customInstance<MerchantGetResponse>(
+      {url: `/merchant/${mId}`, method: 'get', signal
+    },
+      options);
+    }
+  
+
+export const getGetServiceQueryKey = (mId: number,) => [`/merchant/${mId}`];
+
+    
+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 {query: queryOptions, request: requestOptions} = options ?? {}
 
   const queryKey = queryOptions?.queryKey ?? getGetServiceQueryKey(mId);
 
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof getService>>> = ({
-    signal,
-  }) => getService(mId, requestOptions, signal);
+  
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getService>>> = ({ signal }) => getService(mId, requestOptions, signal);
 
-  const query = useQuery<Awaited<ReturnType<typeof getService>>, TError, TData>(
-    queryKey,
-    queryFn,
-    { enabled: !!mId, ...queryOptions }
-  ) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery<Awaited<ReturnType<typeof getService>>, TError, TData>(queryKey, queryFn, {enabled: !!(mId), ...queryOptions}) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
 
   query.queryKey = queryKey;
 
   return query;
-};
+}
+

package/src/organisation/organisation.ts

@@ -8,29 +8,33 @@ A service that provides access to the Account Server, which gives *registered* u
 
  * OpenAPI spec version: 1.0
  */
-import { useQuery, useMutation } from "react-query";
+import {
+  useQuery,
+  useMutation
+} from 'react-query'
 import type {
   UseQueryOptions,
   UseMutationOptions,
   QueryFunction,
   MutationFunction,
   UseQueryResult,
-  QueryKey,
-} from "react-query";
+  QueryKey
+} from 'react-query'
 import type {
   OrganisationsGetResponse,
   AsError,
   OrganisationPostResponse,
   OrganisationPostBodyBody,
-  OrganisationGetDefaultResponse,
-} from "../account-server-api.schemas";
-import { customInstance } from ".././custom-instance";
-import type { ErrorType } from ".././custom-instance";
+  OrganisationGetDefaultResponse
+} from '../account-server-api.schemas'
+import { customInstance } from '.././custom-instance'
+import type { ErrorType } from '.././custom-instance'
+
 
 // eslint-disable-next-line
-type SecondParameter<T extends (...args: any) => any> = T extends (
+  type SecondParameter<T extends (...args: any) => any> = T extends (
   config: any,
-  args: infer P
+  args: infer P,
 ) => any
   ? P
   : never;
@@ -41,53 +45,41 @@ type SecondParameter<T extends (...args: any) => any> = T extends (
  * @summary Gets Organisations
  */
 export const getOrganisations = (
-  options?: SecondParameter<typeof customInstance>,
-  signal?: AbortSignal
+    
+ options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
 ) => {
-  return customInstance<OrganisationsGetResponse>(
-    { url: `/organisation`, method: "get", signal },
-    options
-  );
-};
+      return customInstance<OrganisationsGetResponse>(
+      {url: `/organisation`, method: 'get', signal
+    },
+      options);
+    }
+  
 
 export const getGetOrganisationsQueryKey = () => [`/organisation`];
 
-export type GetOrganisationsQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getOrganisations>>
->;
-export type GetOrganisationsQueryError = ErrorType<void | AsError>;
-
-export const useGetOrganisations = <
-  TData = Awaited<ReturnType<typeof getOrganisations>>,
-  TError = ErrorType<void | AsError>
->(options?: {
-  query?: UseQueryOptions<
-    Awaited<ReturnType<typeof getOrganisations>>,
-    TError,
-    TData
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
+    
+export type GetOrganisationsQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisations>>>
+export type GetOrganisationsQueryError = ErrorType<void | AsError>
+
+export const useGetOrganisations = <TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(
+  options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
+
+  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+
+  const {query: queryOptions, request: requestOptions} = options ?? {}
 
   const queryKey = queryOptions?.queryKey ?? getGetOrganisationsQueryKey();
 
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getOrganisations>>
-  > = ({ signal }) => getOrganisations(requestOptions, signal);
+  
 
-  const query = useQuery<
-    Awaited<ReturnType<typeof getOrganisations>>,
-    TError,
-    TData
-  >(queryKey, queryFn, queryOptions) as UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisations>>> = ({ signal }) => getOrganisations(requestOptions, signal);
+
+  const query = useQuery<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>(queryKey, queryFn, queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
 
   query.queryKey = queryKey;
 
   return query;
-};
+}
 
 /**
  * Creates a new Organisation
@@ -97,57 +89,40 @@ You need **admin** rights to use this method
  * @summary Create a new organisation
  */
 export const createOrganisation = (
-  organisationPostBodyBody: OrganisationPostBodyBody,
-  options?: SecondParameter<typeof customInstance>
-) => {
-  return customInstance<OrganisationPostResponse>(
-    {
-      url: `/organisation`,
-      method: "post",
-      headers: { "Content-Type": "application/json" },
-      data: organisationPostBodyBody,
+    organisationPostBodyBody: OrganisationPostBodyBody,
+ options?: SecondParameter<typeof customInstance>,) => {
+      return customInstance<OrganisationPostResponse>(
+      {url: `/organisation`, method: 'post',
+      headers: {'Content-Type': 'application/json', },
+      data: organisationPostBodyBody
     },
-    options
-  );
-};
-
-export type CreateOrganisationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createOrganisation>>
->;
-export type CreateOrganisationMutationBody = OrganisationPostBodyBody;
-export type CreateOrganisationMutationError = ErrorType<AsError | void>;
-
-export const useCreateOrganisation = <
-  TError = ErrorType<AsError | void>,
-  TContext = unknown
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createOrganisation>>,
-    TError,
-    { data: OrganisationPostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}) => {
-  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createOrganisation>>,
-    { data: OrganisationPostBodyBody }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return createOrganisation(data, requestOptions);
-  };
-
-  return useMutation<
-    Awaited<ReturnType<typeof createOrganisation>>,
-    TError,
-    { data: OrganisationPostBodyBody },
-    TContext
-  >(mutationFn, mutationOptions);
-};
-/**
+      options);
+    }
+  
+
+
+    export type CreateOrganisationMutationResult = NonNullable<Awaited<ReturnType<typeof createOrganisation>>>
+    export type CreateOrganisationMutationBody = OrganisationPostBodyBody
+    export type CreateOrganisationMutationError = ErrorType<AsError | void>
+
+    export const useCreateOrganisation = <TError = ErrorType<AsError | void>,
+    
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof createOrganisation>>, TError,{data: OrganisationPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+) => {
+      const {mutation: mutationOptions, request: requestOptions} = options ?? {}
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createOrganisation>>, {data: OrganisationPostBodyBody}> = (props) => {
+          const {data} = props ?? {};
+
+          return  createOrganisation(data,requestOptions)
+        }
+
+      return useMutation<Awaited<ReturnType<typeof createOrganisation>>, TError, {data: OrganisationPostBodyBody}, TContext>(mutationFn, mutationOptions)
+    }
+    /**
  * Units must first be deleted before an Organisation can be deleted
 
 You need **admin** rights to use this method
@@ -155,104 +130,76 @@ You need **admin** rights to use this method
  * @summary Deletes an Organisation
  */
 export const deleteOrganisation = (
-  orgId: string,
-  options?: SecondParameter<typeof customInstance>
+    orgId: string,
+ options?: SecondParameter<typeof customInstance>,) => {
+      return customInstance<void>(
+      {url: `/organisation/${orgId}`, method: 'delete'
+    },
+      options);
+    }
+  
+
+
+    export type DeleteOrganisationMutationResult = NonNullable<Awaited<ReturnType<typeof deleteOrganisation>>>
+    
+    export type DeleteOrganisationMutationError = ErrorType<AsError>
+
+    export const useDeleteOrganisation = <TError = ErrorType<AsError>,
+    
+    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof deleteOrganisation>>, TError,{orgId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
 ) => {
-  return customInstance<void>(
-    { url: `/organisation/${orgId}`, method: "delete" },
-    options
-  );
-};
-
-export type DeleteOrganisationMutationResult = NonNullable<
-  Awaited<ReturnType<typeof deleteOrganisation>>
->;
-
-export type DeleteOrganisationMutationError = ErrorType<AsError>;
-
-export const useDeleteOrganisation = <
-  TError = ErrorType<AsError>,
-  TContext = unknown
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteOrganisation>>,
-    TError,
-    { orgId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}) => {
-  const { mutation: mutationOptions, request: requestOptions } = options ?? {};
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteOrganisation>>,
-    { orgId: string }
-  > = (props) => {
-    const { orgId } = props ?? {};
-
-    return deleteOrganisation(orgId, requestOptions);
-  };
-
-  return useMutation<
-    Awaited<ReturnType<typeof deleteOrganisation>>,
-    TError,
-    { orgId: string },
-    TContext
-  >(mutationFn, mutationOptions);
-};
-/**
+      const {mutation: mutationOptions, request: requestOptions} = options ?? {}
+
+      
+
+
+      const mutationFn: MutationFunction<Awaited<ReturnType<typeof deleteOrganisation>>, {orgId: string}> = (props) => {
+          const {orgId} = props ?? {};
+
+          return  deleteOrganisation(orgId,requestOptions)
+        }
+
+      return useMutation<Awaited<ReturnType<typeof deleteOrganisation>>, TError, {orgId: string}, TContext>(mutationFn, mutationOptions)
+    }
+    /**
  * Gets the built-in Default Organisation, used exclusively for Personal Units
 
  * @summary Gets the (built-in) Default Organisation
  */
 export const getDefaultOrganisation = (
-  options?: SecondParameter<typeof customInstance>,
-  signal?: AbortSignal
+    
+ options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
 ) => {
-  return customInstance<OrganisationGetDefaultResponse>(
-    { url: `/organisation/default`, method: "get", signal },
-    options
-  );
-};
-
-export const getGetDefaultOrganisationQueryKey = () => [
-  `/organisation/default`,
-];
-
-export type GetDefaultOrganisationQueryResult = NonNullable<
-  Awaited<ReturnType<typeof getDefaultOrganisation>>
->;
-export type GetDefaultOrganisationQueryError = ErrorType<void | AsError>;
-
-export const useGetDefaultOrganisation = <
-  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
-  TError = ErrorType<void | AsError>
->(options?: {
-  query?: UseQueryOptions<
-    Awaited<ReturnType<typeof getDefaultOrganisation>>,
-    TError,
-    TData
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getGetDefaultOrganisationQueryKey();
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getDefaultOrganisation>>
-  > = ({ signal }) => getDefaultOrganisation(requestOptions, signal);
-
-  const query = useQuery<
-    Awaited<ReturnType<typeof getDefaultOrganisation>>,
-    TError,
-    TData
-  >(queryKey, queryFn, queryOptions) as UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
+      return customInstance<OrganisationGetDefaultResponse>(
+      {url: `/organisation/default`, method: 'get', signal
+    },
+      options);
+    }
+  
+
+export const getGetDefaultOrganisationQueryKey = () => [`/organisation/default`];
+
+    
+export type GetDefaultOrganisationQueryResult = NonNullable<Awaited<ReturnType<typeof getDefaultOrganisation>>>
+export type GetDefaultOrganisationQueryError = ErrorType<void | AsError>
+
+export const useGetDefaultOrganisation = <TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>(
+  options?: { query?:UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>, request?: SecondParameter<typeof customInstance>}
+
+  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+
+  const {query: queryOptions, request: requestOptions} = options ?? {}
+
+  const queryKey = queryOptions?.queryKey ?? getGetDefaultOrganisationQueryKey();
+
+  
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getDefaultOrganisation>>> = ({ signal }) => getDefaultOrganisation(requestOptions, signal);
+
+  const query = useQuery<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>(queryKey, queryFn, queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
 
   query.queryKey = queryKey;
 
   return query;
-};
+}
+