@mezo-org/passport 0.4.0-dev.66 → 0.4.0-dev.67

package/dist/src/hooks/index.d.ts

@@ -4,7 +4,6 @@ export * from "./useGetAccountByAddress";
 export * from "./useGetAccountByMezoId";
 export * from "./useGetCurrentAccount";
 export * from "./useGetSession";
-export * from "./useIsUsernameValid";
 export * from "./useLinkAccount";
 export * from "./useRefreshPassport";
 export * from "./useSignInWithDiscord";
@@ -13,4 +12,5 @@ export * from "./useSignOut";
 export * from "./useSignUpWithWallet";
 export { useInvalidateTokensBalances, useResetTokensBalances, } from "./useTokensBalances";
 export * from "./useUpdateMezoId";
+export * from "./useUsernameValidation";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,kDAAkD,EAClD,4BAA4B,EAC5B,oDAAoD,GACrD,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC7E,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,uBAAuB,CAAA;AACrC,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAC5B,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,kDAAkD,EAClD,4BAA4B,EAC5B,oDAAoD,GACrD,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC7E,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,uBAAuB,CAAA;AACrC,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA"}

package/dist/src/hooks/index.js

@@ -4,7 +4,6 @@ export * from "./useGetAccountByAddress";
 export * from "./useGetAccountByMezoId";
 export * from "./useGetCurrentAccount";
 export * from "./useGetSession";
-export * from "./useIsUsernameValid";
 export * from "./useLinkAccount";
 export * from "./useRefreshPassport";
 export * from "./useSignInWithDiscord";
@@ -13,4 +12,5 @@ export * from "./useSignOut";
 export * from "./useSignUpWithWallet";
 export { useInvalidateTokensBalances, useResetTokensBalances, } from "./useTokensBalances";
 export * from "./useUpdateMezoId";
+export * from "./useUsernameValidation";
 //# sourceMappingURL=index.js.map

package/dist/src/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,kDAAkD,EAClD,4BAA4B,EAC5B,oDAAoD,GACrD,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC7E,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,uBAAuB,CAAA;AACrC,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAC5B,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,kDAAkD,EAClD,4BAA4B,EAC5B,oDAAoD,GACrD,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC7E,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,uBAAuB,CAAA;AACrC,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA"}

package/dist/src/hooks/useGetAccountByMezoId.d.ts

@@ -1,6 +1,9 @@
-import { skipToken, UseBaseQueryOptions } from "@tanstack/react-query";
+import { UseBaseQueryOptions } from "@tanstack/react-query";
 import type { AuthApiClient, GetAccountByMezoIdOrAddressResponse } from "../api";
-export declare const getAccountByMezoIdQueryKeys: (mezoId?: string) => (string | undefined)[];
-export declare const getAccountByMezoIdQueryFunction: (authApiClient: AuthApiClient, mezoId?: string) => typeof skipToken | (() => Promise<GetAccountByMezoIdOrAddressResponse | null>);
+export declare const getAccountByMezoIdQueryOptions: ({ authApiClient, mezoId, queryOptions, }: {
+    authApiClient: AuthApiClient;
+    mezoId?: string;
+    queryOptions?: Omit<UseBaseQueryOptions<GetAccountByMezoIdOrAddressResponse | null>, "queryKey" | "queryFn">;
+}) => UseBaseQueryOptions<GetAccountByMezoIdOrAddressResponse | null>;
 export declare function useGetAccountByMezoId(mezoId?: string, queryOptions?: Omit<UseBaseQueryOptions<GetAccountByMezoIdOrAddressResponse | null>, "queryKey" | "queryFn">): import("@tanstack/react-query").UseQueryResult<GetAccountByMezoIdOrAddressResponse | null, Error>;
 //# sourceMappingURL=useGetAccountByMezoId.d.ts.map

package/dist/src/hooks/useGetAccountByMezoId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGetAccountByMezoId.d.ts","sourceRoot":"","sources":["../../../src/hooks/useGetAccountByMezoId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAIhF,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC,EAAE,MAAM,QAAQ,CAAA;AAEhF,eAAO,MAAM,2BAA2B,GAAI,SAAS,MAAM,2BAG1D,CAAA;AAED,eAAO,MAAM,+BAA+B,GAC1C,eAAe,aAAa,EAC5B,SAAS,MAAM,mFAE6D,CAAA;AAE9E,wBAAgB,qBAAqB,CACnC,MAAM,CAAC,EAAE,MAAM,EACf,YAAY,GAAE,IAAI,CAChB,mBAAmB,CAAC,mCAAmC,GAAG,IAAI,CAAC,EAC/D,UAAU,GAAG,SAAS,CAClB,qGAWP"}
+{"version":3,"file":"useGetAccountByMezoId.d.ts","sourceRoot":"","sources":["../../../src/hooks/useGetAccountByMezoId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAIhF,OAAO,KAAK,EAAE,aAAa,EAAE,mCAAmC,EAAE,MAAM,QAAQ,CAAA;AAEhF,eAAO,MAAM,8BAA8B,GAAI,0CAI5C;IACD,aAAa,EAAE,aAAa,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,IAAI,CACjB,mBAAmB,CAAC,mCAAmC,GAAG,IAAI,CAAC,EAC/D,UAAU,GAAG,SAAS,CACvB,CAAA;CACF,KAAG,mBAAmB,CAAC,mCAAmC,GAAG,IAAI,CAMhE,CAAA;AAEF,wBAAgB,qBAAqB,CACnC,MAAM,CAAC,EAAE,MAAM,EACf,YAAY,GAAE,IAAI,CAChB,mBAAmB,CAAC,mCAAmC,GAAG,IAAI,CAAC,EAC/D,UAAU,GAAG,SAAS,CAClB,qGAWP"}

package/dist/src/hooks/useGetAccountByMezoId.js

@@ -2,19 +2,19 @@ import { useQuery, skipToken } from "@tanstack/react-query";
 import { useAuthApiClient } from "./useAuthApiClient";
 import { QUERY_KEYS } from "./constants";
 import { ONE_MINUTE_MS } from "../utils/time";
-export const getAccountByMezoIdQueryKeys = (mezoId) => [
-    QUERY_KEYS.ACCOUNT,
-    mezoId,
-];
-export const getAccountByMezoIdQueryFunction = (authApiClient, mezoId) => mezoId ? () => authApiClient.getAccountByMezoIdOrAddress(mezoId) : skipToken;
+export const getAccountByMezoIdQueryOptions = ({ authApiClient, mezoId, queryOptions = {}, }) => ({
+    queryKey: [QUERY_KEYS.ACCOUNT, mezoId],
+    queryFn: mezoId
+        ? () => authApiClient.getAccountByMezoIdOrAddress(mezoId)
+        : skipToken,
+    ...queryOptions,
+});
 export function useGetAccountByMezoId(mezoId, queryOptions = {}) {
     const authApiClient = useAuthApiClient();
-    return useQuery({
-        queryKey: getAccountByMezoIdQueryKeys(mezoId),
-        queryFn: getAccountByMezoIdQueryFunction(authApiClient, mezoId),
-        staleTime: ONE_MINUTE_MS,
-        retry: 1,
-        ...queryOptions,
-    });
+    return useQuery(getAccountByMezoIdQueryOptions({
+        authApiClient,
+        mezoId,
+        queryOptions: { staleTime: ONE_MINUTE_MS, retry: 1, ...queryOptions },
+    }));
 }
 //# sourceMappingURL=useGetAccountByMezoId.js.map

package/dist/src/hooks/useGetAccountByMezoId.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetAccountByMezoId.js","sourceRoot":"","sources":["../../../src/hooks/useGetAccountByMezoId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAuB,MAAM,uBAAuB,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAG7C,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC;IAC9D,UAAU,CAAC,OAAO;IAClB,MAAM;CACP,CAAA;AAED,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAC7C,aAA4B,EAC5B,MAAe,EACf,EAAE,CACF,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAE9E,MAAM,UAAU,qBAAqB,CACnC,MAAe,EACf,eAGI,EAAE;IAEN,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,OAAO,QAAQ,CAAC;QACd,QAAQ,EAAE,2BAA2B,CAAC,MAAM,CAAC;QAC7C,OAAO,EAAE,+BAA+B,CAAC,aAAa,EAAE,MAAM,CAAC;QAC/D,SAAS,EAAE,aAAa;QACxB,KAAK,EAAE,CAAC;QACR,GAAG,YAAY;KAChB,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"useGetAccountByMezoId.js","sourceRoot":"","sources":["../../../src/hooks/useGetAccountByMezoId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAuB,MAAM,uBAAuB,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAG7C,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,EAC7C,aAAa,EACb,MAAM,EACN,YAAY,GAAG,EAAE,GAQlB,EAAmE,EAAE,CAAC,CAAC;IACtE,QAAQ,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC;IACtC,OAAO,EAAE,MAAM;QACb,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,2BAA2B,CAAC,MAAM,CAAC;QACzD,CAAC,CAAC,SAAS;IACb,GAAG,YAAY;CAChB,CAAC,CAAA;AAEF,MAAM,UAAU,qBAAqB,CACnC,MAAe,EACf,eAGI,EAAE;IAEN,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,OAAO,QAAQ,CACb,8BAA8B,CAAC;QAC7B,aAAa;QACb,MAAM;QACN,YAAY,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,YAAY,EAAE;KACtE,CAAC,CACH,CAAA;AACH,CAAC"}

package/dist/src/hooks/useUsernameValidation.d.ts

@@ -0,0 +1,7 @@
+export declare function useUsernameValidation(): {
+    validateUsername: (username: string) => Promise<{
+        isValid: boolean;
+        errors: string[];
+    }>;
+};
+//# sourceMappingURL=useUsernameValidation.d.ts.map

package/dist/src/hooks/useUsernameValidation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useUsernameValidation.d.ts","sourceRoot":"","sources":["../../../src/hooks/useUsernameValidation.ts"],"names":[],"mappings":"AAOA,wBAAgB,qBAAqB;iCAKhB,MAAM;;;;EA6C1B"}

package/dist/src/hooks/useUsernameValidation.js

@@ -0,0 +1,48 @@
+import { useCallback } from "react";
+import { useQueryClient } from "@tanstack/react-query";
+import { validateUsername } from "../utils/validation";
+import { useAuthApiClient } from "./useAuthApiClient";
+import { ONE_MINUTE_MS } from "../utils/time";
+import { getAccountByMezoIdQueryOptions } from "./useGetAccountByMezoId";
+export function useUsernameValidation() {
+    const queryClient = useQueryClient();
+    const authApiClient = useAuthApiClient();
+    const validateUsernameCallback = useCallback(async (username) => {
+        // Validate if username is correct
+        const errors = validateUsername(username);
+        if (errors.length > 0) {
+            return {
+                isValid: false,
+                errors,
+            };
+        }
+        const mezoId = `${username}.mezo`;
+        let foundUser;
+        // Find if user with given mezoId already exists in DB
+        try {
+            // Thanks to fetchQuery we know the data is up-to-date and also we use
+            // the cached value if the `getAccountByMezoId` hook was already called
+            // with the given mezoId.
+            foundUser = await queryClient.fetchQuery(getAccountByMezoIdQueryOptions({
+                authApiClient,
+                mezoId,
+                queryOptions: { staleTime: ONE_MINUTE_MS, retry: 1 },
+            }));
+            // By default fetchQuery throws an error if it's not resolved with the
+            // data, but we don't want to do that thus the empty catch.
+            // eslint-disable-next-line no-empty
+        }
+        catch (error) { }
+        if (foundUser)
+            return {
+                isValid: false,
+                errors: ["Mezo id already exists."],
+            };
+        return {
+            isValid: true,
+            errors: [],
+        };
+    }, [authApiClient, queryClient]);
+    return { validateUsername: validateUsernameCallback };
+}
+//# sourceMappingURL=useUsernameValidation.js.map

package/dist/src/hooks/useUsernameValidation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useUsernameValidation.js","sourceRoot":"","sources":["../../../src/hooks/useUsernameValidation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAA;AAExE,MAAM,UAAU,qBAAqB;IACnC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,MAAM,wBAAwB,GAAG,WAAW,CAC1C,KAAK,EAAE,QAAgB,EAAE,EAAE;QACzB,kCAAkC;QAClC,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QACzC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM;aACP,CAAA;QACH,CAAC;QAED,MAAM,MAAM,GAAG,GAAG,QAAQ,OAAO,CAAA;QAEjC,IAAI,SAAS,CAAA;QACb,sDAAsD;QACtD,IAAI,CAAC;YACH,sEAAsE;YACtE,uEAAuE;YACvE,yBAAyB;YACzB,SAAS,GAAG,MAAM,WAAW,CAAC,UAAU,CACtC,8BAA8B,CAAC;gBAC7B,aAAa;gBACb,MAAM;gBACN,YAAY,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE;aACrD,CAAC,CACH,CAAA;YACD,sEAAsE;YACtE,2DAA2D;YAC3D,oCAAoC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;QAElB,IAAI,SAAS;YACX,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,CAAC,yBAAyB,CAAC;aACpC,CAAA;QAEH,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,EAAE;SACX,CAAA;IACH,CAAC,EACD,CAAC,aAAa,EAAE,WAAW,CAAC,CAC7B,CAAA;IAED,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,CAAA;AACvD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mezo-org/passport",
-  "version": "0.4.0-dev.66",
+  "version": "0.4.0-dev.67",
   "main": "dist/src/index.js",
   "license": "GPL-3.0-only",
   "scripts": {

package/src/hooks/index.ts

@@ -11,7 +11,6 @@ export * from "./useGetAccountByAddress"
 export * from "./useGetAccountByMezoId"
 export * from "./useGetCurrentAccount"
 export * from "./useGetSession"
-export * from "./useIsUsernameValid"
 export * from "./useLinkAccount"
 export * from "./useRefreshPassport"
 export * from "./useSignInWithDiscord"
@@ -23,3 +22,4 @@ export {
   useResetTokensBalances,
 } from "./useTokensBalances"
 export * from "./useUpdateMezoId"
+export * from "./useUsernameValidation"

package/src/hooks/useGetAccountByMezoId.ts

@@ -4,16 +4,24 @@ import { QUERY_KEYS } from "./constants"
 import { ONE_MINUTE_MS } from "../utils/time"
 import type { AuthApiClient, GetAccountByMezoIdOrAddressResponse } from "../api"
 
-export const getAccountByMezoIdQueryKeys = (mezoId?: string) => [
-  QUERY_KEYS.ACCOUNT,
+export const getAccountByMezoIdQueryOptions = ({
+  authApiClient,
   mezoId,
-]
-
-export const getAccountByMezoIdQueryFunction = (
-  authApiClient: AuthApiClient,
-  mezoId?: string,
-) =>
-  mezoId ? () => authApiClient.getAccountByMezoIdOrAddress(mezoId) : skipToken
+  queryOptions = {},
+}: {
+  authApiClient: AuthApiClient
+  mezoId?: string
+  queryOptions?: Omit<
+    UseBaseQueryOptions<GetAccountByMezoIdOrAddressResponse | null>,
+    "queryKey" | "queryFn"
+  >
+}): UseBaseQueryOptions<GetAccountByMezoIdOrAddressResponse | null> => ({
+  queryKey: [QUERY_KEYS.ACCOUNT, mezoId],
+  queryFn: mezoId
+    ? () => authApiClient.getAccountByMezoIdOrAddress(mezoId)
+    : skipToken,
+  ...queryOptions,
+})
 
 export function useGetAccountByMezoId(
   mezoId?: string,
@@ -24,11 +32,11 @@ export function useGetAccountByMezoId(
 ) {
   const authApiClient = useAuthApiClient()
 
-  return useQuery({
-    queryKey: getAccountByMezoIdQueryKeys(mezoId),
-    queryFn: getAccountByMezoIdQueryFunction(authApiClient, mezoId),
-    staleTime: ONE_MINUTE_MS,
-    retry: 1,
-    ...queryOptions,
-  })
+  return useQuery(
+    getAccountByMezoIdQueryOptions({
+      authApiClient,
+      mezoId,
+      queryOptions: { staleTime: ONE_MINUTE_MS, retry: 1, ...queryOptions },
+    }),
+  )
 }

package/src/hooks/{useIsUsernameValid.ts → useUsernameValidation.ts}

@@ -1,28 +1,42 @@
 import { useCallback } from "react"
 import { useQueryClient } from "@tanstack/react-query"
 import { validateUsername } from "../utils/validation"
-import {
-  getAccountByMezoIdQueryFunction,
-  getAccountByMezoIdQueryKeys,
-} from "./useGetAccountByMezoId"
 import { useAuthApiClient } from "./useAuthApiClient"
 import { ONE_MINUTE_MS } from "../utils/time"
+import { getAccountByMezoIdQueryOptions } from "./useGetAccountByMezoId"
 
-export function useIsUsernameValid() {
+export function useUsernameValidation() {
   const queryClient = useQueryClient()
   const authApiClient = useAuthApiClient()
 
-  const isUsernameValid = useCallback(
+  const validateUsernameCallback = useCallback(
     async (username: string) => {
+      // Validate if username is correct
+      const errors = validateUsername(username)
+      if (errors.length > 0) {
+        return {
+          isValid: false,
+          errors,
+        }
+      }
+
       const mezoId = `${username}.mezo`
 
       let foundUser
+      // Find if user with given mezoId already exists in DB
       try {
-        foundUser = await queryClient.fetchQuery({
-          queryKey: getAccountByMezoIdQueryKeys(mezoId),
-          queryFn: getAccountByMezoIdQueryFunction(authApiClient, mezoId),
-          staleTime: ONE_MINUTE_MS,
-        })
+        // Thanks to fetchQuery we know the data is up-to-date and also we use
+        // the cached value if the `getAccountByMezoId` hook was already called
+        // with the given mezoId.
+        foundUser = await queryClient.fetchQuery(
+          getAccountByMezoIdQueryOptions({
+            authApiClient,
+            mezoId,
+            queryOptions: { staleTime: ONE_MINUTE_MS, retry: 1 },
+          }),
+        )
+        // By default fetchQuery throws an error if it's not resolved with the
+        // data, but we don't want to do that thus the empty catch.
         // eslint-disable-next-line no-empty
       } catch (error) {}
 
@@ -32,14 +46,6 @@ export function useIsUsernameValid() {
           errors: ["Mezo id already exists."],
         }
 
-      const errors = validateUsername(username)
-      if (errors.length > 0) {
-        return {
-          isValid: false,
-          errors,
-        }
-      }
-
       return {
         isValid: true,
         errors: [],
@@ -48,5 +54,5 @@ export function useIsUsernameValid() {
     [authApiClient, queryClient],
   )
 
-  return { isUsernameValid }
+  return { validateUsername: validateUsernameCallback }
 }

package/dist/src/hooks/useIsUsernameValid.d.ts

@@ -1,7 +0,0 @@
-export declare function useIsUsernameValid(): {
-    isUsernameValid: (username: string) => Promise<{
-        isValid: boolean;
-        errors: string[];
-    }>;
-};
-//# sourceMappingURL=useIsUsernameValid.d.ts.map

package/dist/src/hooks/useIsUsernameValid.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useIsUsernameValid.d.ts","sourceRoot":"","sources":["../../../src/hooks/useIsUsernameValid.ts"],"names":[],"mappings":"AAUA,wBAAgB,kBAAkB;gCAKb,MAAM;;;;EAoC1B"}

package/dist/src/hooks/useIsUsernameValid.js

@@ -1,41 +0,0 @@
-import { useCallback } from "react";
-import { useQueryClient } from "@tanstack/react-query";
-import { validateUsername } from "../utils/validation";
-import { getAccountByMezoIdQueryFunction, getAccountByMezoIdQueryKeys, } from "./useGetAccountByMezoId";
-import { useAuthApiClient } from "./useAuthApiClient";
-import { ONE_MINUTE_MS } from "../utils/time";
-export function useIsUsernameValid() {
-    const queryClient = useQueryClient();
-    const authApiClient = useAuthApiClient();
-    const isUsernameValid = useCallback(async (username) => {
-        const mezoId = `${username}.mezo`;
-        let foundUser;
-        try {
-            foundUser = await queryClient.fetchQuery({
-                queryKey: getAccountByMezoIdQueryKeys(mezoId),
-                queryFn: getAccountByMezoIdQueryFunction(authApiClient, mezoId),
-                staleTime: ONE_MINUTE_MS,
-            });
-            // eslint-disable-next-line no-empty
-        }
-        catch (error) { }
-        if (foundUser)
-            return {
-                isValid: false,
-                errors: ["Mezo id already exists."],
-            };
-        const errors = validateUsername(username);
-        if (errors.length > 0) {
-            return {
-                isValid: false,
-                errors,
-            };
-        }
-        return {
-            isValid: true,
-            errors: [],
-        };
-    }, [authApiClient, queryClient]);
-    return { isUsernameValid };
-}
-//# sourceMappingURL=useIsUsernameValid.js.map

package/dist/src/hooks/useIsUsernameValid.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useIsUsernameValid.js","sourceRoot":"","sources":["../../../src/hooks/useIsUsernameValid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EACL,+BAA+B,EAC/B,2BAA2B,GAC5B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE7C,MAAM,UAAU,kBAAkB;IAChC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,MAAM,eAAe,GAAG,WAAW,CACjC,KAAK,EAAE,QAAgB,EAAE,EAAE;QACzB,MAAM,MAAM,GAAG,GAAG,QAAQ,OAAO,CAAA;QAEjC,IAAI,SAAS,CAAA;QACb,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC;gBACvC,QAAQ,EAAE,2BAA2B,CAAC,MAAM,CAAC;gBAC7C,OAAO,EAAE,+BAA+B,CAAC,aAAa,EAAE,MAAM,CAAC;gBAC/D,SAAS,EAAE,aAAa;aACzB,CAAC,CAAA;YACF,oCAAoC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;QAElB,IAAI,SAAS;YACX,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,CAAC,yBAAyB,CAAC;aACpC,CAAA;QAEH,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QACzC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM;aACP,CAAA;QACH,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,EAAE;SACX,CAAA;IACH,CAAC,EACD,CAAC,aAAa,EAAE,WAAW,CAAC,CAC7B,CAAA;IAED,OAAO,EAAE,eAAe,EAAE,CAAA;AAC5B,CAAC"}