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

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

@@ -3,6 +3,5 @@ export declare const QUERY_KEYS: {
     SESSION: string;
     CURRENT: string;
     ASSETS_USD_CONVERSION: string;
-    USERNAME_VALIDATION: string;
 };
 //# sourceMappingURL=constants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/hooks/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU;;;;;;CAMtB,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/hooks/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU;;;;;CAKtB,CAAA"}

package/dist/src/hooks/constants.js

@@ -3,6 +3,5 @@ export const QUERY_KEYS = {
     SESSION: "session",
     CURRENT: "current",
     ASSETS_USD_CONVERSION: "assetsUsdConversion",
-    USERNAME_VALIDATION: "usernameValidation",
 };
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/hooks/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,qBAAqB,EAAE,qBAAqB;IAC5C,mBAAmB,EAAE,oBAAoB;CAC1C,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/hooks/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,qBAAqB,EAAE,qBAAqB;CAC7C,CAAA"}

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

@@ -5,6 +5,7 @@ export * from "./useGetAccountByMezoId";
 export * from "./useGetCurrentAccount";
 export * from "./useGetSession";
 export * from "./useLinkAccount";
+export * from "./useMezoIdValidation";
 export * from "./useRefreshPassport";
 export * from "./useSignInWithDiscord";
 export * from "./useSignInWithWallet";
@@ -12,5 +13,4 @@ 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,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"}
+{"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,uBAAuB,CAAA;AACrC,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"}

package/dist/src/hooks/index.js

@@ -5,6 +5,7 @@ export * from "./useGetAccountByMezoId";
 export * from "./useGetCurrentAccount";
 export * from "./useGetSession";
 export * from "./useLinkAccount";
+export * from "./useMezoIdValidation";
 export * from "./useRefreshPassport";
 export * from "./useSignInWithDiscord";
 export * from "./useSignInWithWallet";
@@ -12,5 +13,4 @@ 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,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"}
+{"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,uBAAuB,CAAA;AACrC,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"}

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

@@ -1,9 +1,4 @@
 import { UseBaseQueryOptions } from "@tanstack/react-query";
-import type { AuthApiClient, GetAccountByMezoIdOrAddressResponse } from "../api";
-export declare const getAccountByMezoIdQueryOptions: ({ authApiClient, mezoId, queryOptions, }: {
-    authApiClient: AuthApiClient;
-    mezoId?: string;
-    queryOptions?: Omit<UseBaseQueryOptions<GetAccountByMezoIdOrAddressResponse | null>, "queryKey" | "queryFn">;
-}) => UseBaseQueryOptions<GetAccountByMezoIdOrAddressResponse | null>;
+import type { GetAccountByMezoIdOrAddressResponse } from "../api";
 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,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"}
+{"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,mCAAmC,EAAE,MAAM,QAAQ,CAAA;AAEjE,wBAAgB,qBAAqB,CACnC,MAAM,CAAC,EAAE,MAAM,EACf,YAAY,GAAE,IAAI,CAChB,mBAAmB,CAAC,mCAAmC,GAAG,IAAI,CAAC,EAC/D,UAAU,GAAG,SAAS,CAClB,qGAaP"}

package/dist/src/hooks/useGetAccountByMezoId.js

@@ -2,19 +2,16 @@ 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 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(getAccountByMezoIdQueryOptions({
-        authApiClient,
-        mezoId,
-        queryOptions: { staleTime: ONE_MINUTE_MS, retry: 1, ...queryOptions },
-    }));
+    return useQuery({
+        queryKey: [QUERY_KEYS.ACCOUNT, mezoId],
+        queryFn: mezoId
+            ? () => authApiClient.getAccountByMezoIdOrAddress(mezoId)
+            : skipToken,
+        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,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"}
+{"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,UAAU,qBAAqB,CACnC,MAAe,EACf,eAGI,EAAE;IAEN,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,OAAO,QAAQ,CAAC;QACd,QAAQ,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC;QACtC,OAAO,EAAE,MAAM;YACb,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,2BAA2B,CAAC,MAAM,CAAC;YACzD,CAAC,CAAC,SAAS;QACb,SAAS,EAAE,aAAa;QACxB,KAAK,EAAE,CAAC;QACR,GAAG,YAAY;KAChB,CAAC,CAAA;AACJ,CAAC"}

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

@@ -0,0 +1,8 @@
+import { UseQueryResult } from "@tanstack/react-query";
+import { MezoId } from "../utils/mezoId";
+export declare function useMezoIdValidation(mezoId: MezoId): UseQueryResult<{
+    isValid: boolean;
+    isAvailable: boolean;
+    errors: string[];
+}>;
+//# sourceMappingURL=useMezoIdValidation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useMezoIdValidation.d.ts","sourceRoot":"","sources":["../../../src/hooks/useMezoIdValidation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAkB,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAGxD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAqB1C,cAAc,CAAC;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,OAAO,CAAA;IACpB,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB,CAAC,CACH"}

package/dist/src/hooks/useMezoIdValidation.js

@@ -0,0 +1,24 @@
+import { validateMezoId } from "../utils/mezoId";
+import { useGetAccountByMezoId } from "./useGetAccountByMezoId";
+export function useMezoIdValidation(mezoId) {
+    const validationErrors = validateMezoId(mezoId);
+    return useGetAccountByMezoId(mezoId, {
+        placeholderData: {
+            // @ts-expect-error TODO: Couldn't fix type for placeholderData which for
+            // some reason should return the same data as the data returned in
+            // queryFn.
+            isValid: validationErrors.length === 0,
+            isAvailable: validationErrors.length === 0,
+            errors: validationErrors,
+        },
+        enabled: validationErrors.length === 0,
+        // @ts-expect-error TODO: Couldn't fix type for select which for some reason
+        // should return the same data as the data returned in queryFn.
+        select: (data) => {
+            const isValid = validationErrors.length === 0;
+            const isAvailable = isValid ? !data : false;
+            return { isValid, isAvailable, errors: validationErrors };
+        },
+    });
+}
+//# sourceMappingURL=useMezoIdValidation.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useMezoIdValidation.js","sourceRoot":"","sources":["../../../src/hooks/useMezoIdValidation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAU,MAAM,iBAAiB,CAAA;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAE/D,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,MAAM,gBAAgB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;IAE/C,OAAO,qBAAqB,CAAC,MAAM,EAAE;QACnC,eAAe,EAAE;YACf,yEAAyE;YACzE,kEAAkE;YAClE,WAAW;YACX,OAAO,EAAE,gBAAgB,CAAC,MAAM,KAAK,CAAC;YACtC,WAAW,EAAE,gBAAgB,CAAC,MAAM,KAAK,CAAC;YAC1C,MAAM,EAAE,gBAAgB;SACzB;QACD,OAAO,EAAE,gBAAgB,CAAC,MAAM,KAAK,CAAC;QACtC,4EAA4E;QAC5E,+DAA+D;QAC/D,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACf,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,KAAK,CAAC,CAAA;YAC7C,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;YAE3C,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAA;QAC3D,CAAC;KACF,CAIC,CAAA;AACJ,CAAC"}

package/dist/src/utils/mezoId.d.ts

@@ -0,0 +1,3 @@
+export type MezoId = `${string}.mezo`;
+export declare function validateMezoId(mezoId: string): string[];
+//# sourceMappingURL=mezoId.d.ts.map

package/dist/src/utils/mezoId.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mezoId.d.ts","sourceRoot":"","sources":["../../../src/utils/mezoId.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG,GAAG,MAAM,OAAO,CAAA;AAqCrC,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAYvD"}

package/dist/src/utils/{validation.js → mezoId.js}

@@ -6,7 +6,7 @@
 //
 // A few addenda are made to ensure that nothing can sneak through that could
 // look like an Ethereum or Bitcoin address.
-const DISALLOWED_USERNAME_PATTERNS = [
+const DISALLOWED_MEZO_ID_PATTERNS = [
     // RFC1034.
     { pattern: /^$/, error: "Must not be empty." },
     { pattern: /^.{16,}$/, error: "Must have 15 characters or fewer." },
@@ -30,8 +30,12 @@ const DISALLOWED_USERNAME_PATTERNS = [
         error: 'No "m" + "numeric string" prefixes.',
     },
 ];
-export function validateUsername(username) {
-    const errors = DISALLOWED_USERNAME_PATTERNS.flatMap(({ pattern, error }) => pattern.test(username) ? [error] : []);
+export function validateMezoId(mezoId) {
+    if (!/\.mezo$/.test(mezoId)) {
+        return ["Must end with '.mezo'."];
+    }
+    const mezoIdWithoutSuffix = mezoId.replace(/\.mezo$/, "");
+    const errors = DISALLOWED_MEZO_ID_PATTERNS.flatMap(({ pattern, error }) => pattern.test(mezoIdWithoutSuffix) ? [error] : []);
     return errors;
 }
-//# sourceMappingURL=validation.js.map
+//# sourceMappingURL=mezoId.js.map

package/dist/src/utils/mezoId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mezoId.js","sourceRoot":"","sources":["../../../src/utils/mezoId.ts"],"names":[],"mappings":"AAEA,6EAA6E;AAC7E,8CAA8C;AAE9C,2EAA2E;AAC3E,8DAA8D;AAC9D,4CAA4C;AAC5C,EAAE;AACF,6EAA6E;AAC7E,4CAA4C;AAC5C,MAAM,2BAA2B,GAAyC;IACxE,WAAW;IACX,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,oBAAoB,EAAE;IAC9C,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,mCAAmC,EAAE;IACnE;QACE,OAAO,EAAE,YAAY;QACrB,KAAK,EAAE,kDAAkD;KAC1D;IACD;QACE,OAAO,EAAE,eAAe;QACxB,KAAK,EACH,qEAAqE;KACxE;IACD,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,+BAA+B,EAAE;IACzD,iCAAiC;IACjC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,sBAAsB,EAAE;IACjD;QACE,OAAO,EAAE,kCAAkC;QAC3C,KAAK,EAAE,6CAA6C;KACrD;IACD;QACE,OAAO,EAAE,YAAY;QACrB,KAAK,EAAE,qCAAqC;KAC7C;CACF,CAAA;AAED,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,wBAAwB,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IAEzD,MAAM,MAAM,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CACxE,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CACjD,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}

package/package.json

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

package/src/hooks/constants.ts

@@ -3,5 +3,4 @@ export const QUERY_KEYS = {
   SESSION: "session",
   CURRENT: "current",
   ASSETS_USD_CONVERSION: "assetsUsdConversion",
-  USERNAME_VALIDATION: "usernameValidation",
 }

package/src/hooks/index.ts

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

package/src/hooks/useGetAccountByMezoId.ts

@@ -2,26 +2,7 @@ import { useQuery, skipToken, UseBaseQueryOptions } from "@tanstack/react-query"
 import { useAuthApiClient } from "./useAuthApiClient"
 import { QUERY_KEYS } from "./constants"
 import { ONE_MINUTE_MS } from "../utils/time"
-import type { AuthApiClient, GetAccountByMezoIdOrAddressResponse } from "../api"
-
-export const getAccountByMezoIdQueryOptions = ({
-  authApiClient,
-  mezoId,
-  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,
-})
+import type { GetAccountByMezoIdOrAddressResponse } from "../api"
 
 export function useGetAccountByMezoId(
   mezoId?: string,
@@ -32,11 +13,13 @@ export function useGetAccountByMezoId(
 ) {
   const authApiClient = useAuthApiClient()
 
-  return useQuery(
-    getAccountByMezoIdQueryOptions({
-      authApiClient,
-      mezoId,
-      queryOptions: { staleTime: ONE_MINUTE_MS, retry: 1, ...queryOptions },
-    }),
-  )
+  return useQuery({
+    queryKey: [QUERY_KEYS.ACCOUNT, mezoId],
+    queryFn: mezoId
+      ? () => authApiClient.getAccountByMezoIdOrAddress(mezoId)
+      : skipToken,
+    staleTime: ONE_MINUTE_MS,
+    retry: 1,
+    ...queryOptions,
+  })
 }

package/src/hooks/useMezoIdValidation.ts

@@ -0,0 +1,31 @@
+import { UseQueryResult } from "@tanstack/react-query"
+import { validateMezoId, MezoId } from "../utils/mezoId"
+import { useGetAccountByMezoId } from "./useGetAccountByMezoId"
+
+export function useMezoIdValidation(mezoId: MezoId) {
+  const validationErrors = validateMezoId(mezoId)
+
+  return useGetAccountByMezoId(mezoId, {
+    placeholderData: {
+      // @ts-expect-error TODO: Couldn't fix type for placeholderData which for
+      // some reason should return the same data as the data returned in
+      // queryFn.
+      isValid: validationErrors.length === 0,
+      isAvailable: validationErrors.length === 0,
+      errors: validationErrors,
+    },
+    enabled: validationErrors.length === 0,
+    // @ts-expect-error TODO: Couldn't fix type for select which for some reason
+    // should return the same data as the data returned in queryFn.
+    select: (data) => {
+      const isValid = validationErrors.length === 0
+      const isAvailable = isValid ? !data : false
+
+      return { isValid, isAvailable, errors: validationErrors }
+    },
+  }) as UseQueryResult<{
+    isValid: boolean
+    isAvailable: boolean
+    errors: string[]
+  }>
+}

package/src/utils/{validation.ts → mezoId.ts}

@@ -1,3 +1,5 @@
+export type MezoId = `${string}.mezo`
+
 // NOTE: This was copied from mezo-portal and is based on the validation from
 // workers/passport-auth/src/utils/mezo-id.ts.
 
@@ -7,7 +9,7 @@
 //
 // A few addenda are made to ensure that nothing can sneak through that could
 // look like an Ethereum or Bitcoin address.
-const DISALLOWED_USERNAME_PATTERNS: { pattern: RegExp; error: string }[] = [
+const DISALLOWED_MEZO_ID_PATTERNS: { pattern: RegExp; error: string }[] = [
   // RFC1034.
   { pattern: /^$/, error: "Must not be empty." },
   { pattern: /^.{16,}$/, error: "Must have 15 characters or fewer." },
@@ -33,9 +35,15 @@ const DISALLOWED_USERNAME_PATTERNS: { pattern: RegExp; error: string }[] = [
   },
 ]
 
-export function validateUsername(username: string): string[] {
-  const errors = DISALLOWED_USERNAME_PATTERNS.flatMap(({ pattern, error }) =>
-    pattern.test(username) ? [error] : [],
+export function validateMezoId(mezoId: string): string[] {
+  if (!/\.mezo$/.test(mezoId)) {
+    return ["Must end with '.mezo'."]
+  }
+
+  const mezoIdWithoutSuffix = mezoId.replace(/\.mezo$/, "")
+
+  const errors = DISALLOWED_MEZO_ID_PATTERNS.flatMap(({ pattern, error }) =>
+    pattern.test(mezoIdWithoutSuffix) ? [error] : [],
   )
 
   return errors

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

@@ -1,7 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,48 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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/dist/src/utils/validation.d.ts

@@ -1,2 +0,0 @@
-export declare function validateUsername(username: string): string[];
-//# sourceMappingURL=validation.d.ts.map

package/dist/src/utils/validation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAmCA,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAM3D"}

package/dist/src/utils/validation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,8CAA8C;AAE9C,2EAA2E;AAC3E,8DAA8D;AAC9D,4CAA4C;AAC5C,EAAE;AACF,6EAA6E;AAC7E,4CAA4C;AAC5C,MAAM,4BAA4B,GAAyC;IACzE,WAAW;IACX,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,oBAAoB,EAAE;IAC9C,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,mCAAmC,EAAE;IACnE;QACE,OAAO,EAAE,YAAY;QACrB,KAAK,EAAE,kDAAkD;KAC1D;IACD;QACE,OAAO,EAAE,eAAe;QACxB,KAAK,EACH,qEAAqE;KACxE;IACD,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,+BAA+B,EAAE;IACzD,iCAAiC;IACjC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,sBAAsB,EAAE;IACjD;QACE,OAAO,EAAE,kCAAkC;QAC3C,KAAK,EAAE,6CAA6C;KACrD;IACD;QACE,OAAO,EAAE,YAAY;QACrB,KAAK,EAAE,qCAAqC;KAC7C;CACF,CAAA;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,MAAM,MAAM,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CACzE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CACtC,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}

package/src/hooks/useUsernameValidation.ts

@@ -1,58 +0,0 @@
-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: 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 {
-        // 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 }
-}