@mezo-org/passport 0.4.0-dev.66 → 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

@@ -4,8 +4,8 @@ export * from "./useGetAccountByAddress";
 export * from "./useGetAccountByMezoId";
 export * from "./useGetCurrentAccount";
 export * from "./useGetSession";
-export * from "./useIsUsernameValid";
 export * from "./useLinkAccount";
+export * from "./useMezoIdValidation";
 export * from "./useRefreshPassport";
 export * from "./useSignInWithDiscord";
 export * from "./useSignInWithWallet";

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,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

@@ -4,8 +4,8 @@ export * from "./useGetAccountByAddress";
 export * from "./useGetAccountByMezoId";
 export * from "./useGetCurrentAccount";
 export * from "./useGetSession";
-export * from "./useIsUsernameValid";
 export * from "./useLinkAccount";
+export * from "./useMezoIdValidation";
 export * from "./useRefreshPassport";
 export * from "./useSignInWithDiscord";
 export * from "./useSignInWithWallet";

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,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,6 +1,4 @@
-import { skipToken, 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>);
+import { UseBaseQueryOptions } from "@tanstack/react-query";
+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,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,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,16 +2,13 @@ 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 function useGetAccountByMezoId(mezoId, queryOptions = {}) {
     const authApiClient = useAuthApiClient();
     return useQuery({
-        queryKey: getAccountByMezoIdQueryKeys(mezoId),
-        queryFn: getAccountByMezoIdQueryFunction(authApiClient, mezoId),
+        queryKey: [QUERY_KEYS.ACCOUNT, mezoId],
+        queryFn: mezoId
+            ? () => authApiClient.getAccountByMezoIdOrAddress(mezoId)
+            : skipToken,
         staleTime: ONE_MINUTE_MS,
         retry: 1,
         ...queryOptions,

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,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.66",
+  "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

@@ -11,8 +11,8 @@ export * from "./useGetAccountByAddress"
 export * from "./useGetAccountByMezoId"
 export * from "./useGetCurrentAccount"
 export * from "./useGetSession"
-export * from "./useIsUsernameValid"
 export * from "./useLinkAccount"
+export * from "./useMezoIdValidation"
 export * from "./useRefreshPassport"
 export * from "./useSignInWithDiscord"
 export * from "./useSignInWithWallet"

package/src/hooks/useGetAccountByMezoId.ts

@@ -2,18 +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 getAccountByMezoIdQueryKeys = (mezoId?: string) => [
-  QUERY_KEYS.ACCOUNT,
-  mezoId,
-]
-
-export const getAccountByMezoIdQueryFunction = (
-  authApiClient: AuthApiClient,
-  mezoId?: string,
-) =>
-  mezoId ? () => authApiClient.getAccountByMezoIdOrAddress(mezoId) : skipToken
+import type { GetAccountByMezoIdOrAddressResponse } from "../api"
 
 export function useGetAccountByMezoId(
   mezoId?: string,
@@ -25,8 +14,10 @@ export function useGetAccountByMezoId(
   const authApiClient = useAuthApiClient()
 
   return useQuery({
-    queryKey: getAccountByMezoIdQueryKeys(mezoId),
-    queryFn: getAccountByMezoIdQueryFunction(authApiClient, mezoId),
+    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/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"}

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/useIsUsernameValid.ts

@@ -1,52 +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: string) => {
-      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 }
-}