@squonk/account-server-client 4.4.0-4-4.2194860267 → 4.4.0-4-4.2197069952

package/src/api/merchant/merchant.ts

@@ -10,6 +10,8 @@ A service that provides access to the Account Server, which gives *registered* u
  */
 import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
+  InvalidateOptions,
+  QueryClient,
   QueryFunction,
   QueryKey,
   UseQueryOptions,
@@ -18,11 +20,10 @@ import type {
   UseSuspenseQueryResult,
 } from "@tanstack/react-query";
 
-import type { AsError, MerchantDetail, MerchantsGetResponse } from "../api.schemas";
+import type { AsError, MerchantDetail, MerchantsGetResponse } from ".././api-schemas";
 
-import { customInstance } from "../../custom-instance";
-import type { ErrorType } from "../../custom-instance";
-import { queryMutator } from "../../options-mutator";
+import { customInstance } from "../../custom-axios";
+import type { ErrorType } from "../../custom-axios";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
@@ -41,10 +42,10 @@ export const getMerchants = (
 };
 
 export const getGetMerchantsQueryKey = () => {
-  return [`/merchant`] as const;
+  return ["account-server", "merchant"] as const;
 };
 
-export const useGetMerchantsQueryOptions = <
+export const getGetMerchantsQueryOptions = <
   TData = Awaited<ReturnType<typeof getMerchants>>,
   TError = ErrorType<AsError | void>,
 >(options?: {
@@ -58,9 +59,7 @@ export const useGetMerchantsQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getMerchants>>> = ({ signal }) =>
     getMerchants(requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
-
-  return customOptions as UseQueryOptions<
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
     Awaited<ReturnType<typeof getMerchants>>,
     TError,
     TData
@@ -81,7 +80,7 @@ export function useGetMerchants<
   query?: UseQueryOptions<Awaited<ReturnType<typeof getMerchants>>, TError, TData>;
   request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
-  const queryOptions = useGetMerchantsQueryOptions(options);
+  const queryOptions = getGetMerchantsQueryOptions(options);
 
   const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
 
@@ -90,7 +89,19 @@ export function useGetMerchants<
   return query;
 }
 
-export const useGetMerchantsSuspenseQueryOptions = <
+/**
+ * @summary Gets all Merchants
+ */
+export const invalidateGetMerchants = async (
+  queryClient: QueryClient,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries({ queryKey: getGetMerchantsQueryKey() }, options);
+
+  return queryClient;
+};
+
+export const getGetMerchantsSuspenseQueryOptions = <
   TData = Awaited<ReturnType<typeof getMerchants>>,
   TError = ErrorType<AsError | void>,
 >(options?: {
@@ -104,9 +115,7 @@ export const useGetMerchantsSuspenseQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getMerchants>>> = ({ signal }) =>
     getMerchants(requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
-
-  return customOptions as UseSuspenseQueryOptions<
+  return { queryKey, queryFn, ...queryOptions } as UseSuspenseQueryOptions<
     Awaited<ReturnType<typeof getMerchants>>,
     TError,
     TData
@@ -127,7 +136,7 @@ export function useGetMerchantsSuspense<
   query?: UseSuspenseQueryOptions<Awaited<ReturnType<typeof getMerchants>>, TError, TData>;
   request?: SecondParameter<typeof customInstance>;
 }): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
-  const queryOptions = useGetMerchantsSuspenseQueryOptions(options);
+  const queryOptions = getGetMerchantsSuspenseQueryOptions(options);
 
   const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
     queryKey: QueryKey;
@@ -155,10 +164,10 @@ export const getService = (
 };
 
 export const getGetServiceQueryKey = (mId?: number) => {
-  return [`/merchant/${mId}`] as const;
+  return ["account-server", "merchant", mId] as const;
 };
 
-export const useGetServiceQueryOptions = <
+export const getGetServiceQueryOptions = <
   TData = Awaited<ReturnType<typeof getService>>,
   TError = ErrorType<AsError | void>,
 >(
@@ -175,11 +184,11 @@ export const useGetServiceQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getService>>> = ({ signal }) =>
     getService(mId, requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
-
-  return customOptions as UseQueryOptions<Awaited<ReturnType<typeof getService>>, TError, TData> & {
-    queryKey: QueryKey;
-  };
+  return { queryKey, queryFn, enabled: !!mId, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof getService>>,
+    TError,
+    TData
+  > & { queryKey: QueryKey };
 };
 
 export type GetServiceQueryResult = NonNullable<Awaited<ReturnType<typeof getService>>>;
@@ -199,7 +208,7 @@ export function useGetService<
     request?: SecondParameter<typeof customInstance>;
   },
 ): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
-  const queryOptions = useGetServiceQueryOptions(mId, options);
+  const queryOptions = getGetServiceQueryOptions(mId, options);
 
   const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
 
@@ -208,7 +217,20 @@ export function useGetService<
   return query;
 }
 
-export const useGetServiceSuspenseQueryOptions = <
+/**
+ * @summary Gets a specific Merchant
+ */
+export const invalidateGetService = async (
+  queryClient: QueryClient,
+  mId: number,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries({ queryKey: getGetServiceQueryKey(mId) }, options);
+
+  return queryClient;
+};
+
+export const getGetServiceSuspenseQueryOptions = <
   TData = Awaited<ReturnType<typeof getService>>,
   TError = ErrorType<AsError | void>,
 >(
@@ -225,9 +247,7 @@ export const useGetServiceSuspenseQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getService>>> = ({ signal }) =>
     getService(mId, requestOptions, signal);
 
-  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
-
-  return customOptions as UseSuspenseQueryOptions<
+  return { queryKey, queryFn, ...queryOptions } as UseSuspenseQueryOptions<
     Awaited<ReturnType<typeof getService>>,
     TError,
     TData
@@ -251,7 +271,7 @@ export function useGetServiceSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
 ): UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey } {
-  const queryOptions = useGetServiceSuspenseQueryOptions(mId, options);
+  const queryOptions = getGetServiceSuspenseQueryOptions(mId, options);
 
   const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult<TData, TError> & {
     queryKey: QueryKey;