@ensdomains/ensjs 3.0.0-alpha.51 → 3.0.0-alpha.52

package/dist/cjs/utils/fuses.js

@@ -46,6 +46,7 @@ const CANNOT_TRANSFER = 4;
 const CANNOT_SET_RESOLVER = 8;
 const CANNOT_SET_TTL = 16;
 const CANNOT_CREATE_SUBDOMAIN = 32;
+const CANNOT_APPROVE = 64;
 const PARENT_CANNOT_CONTROL = 65536;
 const IS_DOT_ETH = 131072;
 const CAN_EXTEND_EXPIRY = 262144;
@@ -59,7 +60,8 @@ const childFuseEnum = {
   CANNOT_TRANSFER,
   CANNOT_SET_RESOLVER,
   CANNOT_SET_TTL,
-  CANNOT_CREATE_SUBDOMAIN
+  CANNOT_CREATE_SUBDOMAIN,
+  CANNOT_APPROVE
 };
 const parentFuseEnum = {
   PARENT_CANNOT_CONTROL,
@@ -79,7 +81,6 @@ const fullFuseEnum = {
   CAN_DO_EVERYTHING
 };
 const unnamedChildFuses = [
-  64,
   128,
   256,
   512,

package/dist/cjs/utils/normalise.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,25 +15,28 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var normalise_exports = {};
 __export(normalise_exports, {
+  beautify: () => beautify,
+  emoji: () => emoji,
+  isCombiningMark: () => isCombiningMark,
   namehash: () => namehash,
-  normalise: () => normalise
+  normalise: () => normalise,
+  normalizeFragment: () => normalizeFragment,
+  shouldEscape: () => shouldEscape,
+  split: () => split,
+  tokenise: () => tokenise
 });
 module.exports = __toCommonJS(normalise_exports);
+var import_ens_normalize = require("@adraffy/ens-normalize");
 var import_bytes = require("@ethersproject/bytes");
 var import_keccak256 = require("@ethersproject/keccak256");
 var import_strings = require("@ethersproject/strings");
-var import_uts46bundle = __toESM(require("idna-uts46-hx/uts46bundle.js"));
 var import_labels = require("./labels");
 const zeros = new Uint8Array(32);
 zeros.fill(0);
-const normalise = (name) => name ? import_uts46bundle.default.toUnicode(name, { useStd3ASCII: true }) : name;
+const normalise = (name) => name ? (0, import_ens_normalize.ens_normalize)(name) : name;
 const namehash = (name) => {
   let result = zeros;
   if (name) {
@@ -55,3 +56,10 @@ const namehash = (name) => {
   }
   return result;
 };
+const beautify = import_ens_normalize.ens_beautify;
+const emoji = import_ens_normalize.ens_emoji;
+const normalizeFragment = import_ens_normalize.ens_normalize_fragment;
+const split = import_ens_normalize.ens_split;
+const tokenise = import_ens_normalize.ens_tokenize;
+const isCombiningMark = import_ens_normalize.is_combining_mark;
+const shouldEscape = import_ens_normalize.should_escape;

package/dist/esm/utils/fuses.mjs

@@ -5,6 +5,7 @@ var CANNOT_TRANSFER = 4;
 var CANNOT_SET_RESOLVER = 8;
 var CANNOT_SET_TTL = 16;
 var CANNOT_CREATE_SUBDOMAIN = 32;
+var CANNOT_APPROVE = 64;
 var PARENT_CANNOT_CONTROL = 65536;
 var IS_DOT_ETH = 131072;
 var CAN_EXTEND_EXPIRY = 262144;
@@ -18,7 +19,8 @@ var childFuseEnum = {
   CANNOT_TRANSFER,
   CANNOT_SET_RESOLVER,
   CANNOT_SET_TTL,
-  CANNOT_CREATE_SUBDOMAIN
+  CANNOT_CREATE_SUBDOMAIN,
+  CANNOT_APPROVE
 };
 var parentFuseEnum = {
   PARENT_CANNOT_CONTROL,
@@ -38,7 +40,6 @@ var fullFuseEnum = {
   CAN_DO_EVERYTHING
 };
 var unnamedChildFuses = [
-  64,
   128,
   256,
   512,

package/dist/esm/utils/normalise.mjs

@@ -1,12 +1,21 @@
 // src/utils/normalise.ts
+import {
+  ens_beautify,
+  ens_emoji,
+  ens_normalize,
+  ens_normalize_fragment,
+  ens_split,
+  ens_tokenize,
+  is_combining_mark,
+  should_escape
+} from "@adraffy/ens-normalize";
 import { concat, hexlify } from "@ethersproject/bytes";
 import { keccak256 } from "@ethersproject/keccak256";
 import { toUtf8Bytes } from "@ethersproject/strings";
-import uts46 from "idna-uts46-hx/uts46bundle.js";
 import { decodeLabelhash, isEncodedLabelhash } from "./labels.mjs";
 var zeros = new Uint8Array(32);
 zeros.fill(0);
-var normalise = (name) => name ? uts46.toUnicode(name, { useStd3ASCII: true }) : name;
+var normalise = (name) => name ? ens_normalize(name) : name;
 var namehash = (name) => {
   let result = zeros;
   if (name) {
@@ -26,7 +35,21 @@ var namehash = (name) => {
   }
   return result;
 };
+var beautify = ens_beautify;
+var emoji = ens_emoji;
+var normalizeFragment = ens_normalize_fragment;
+var split = ens_split;
+var tokenise = ens_tokenize;
+var isCombiningMark = is_combining_mark;
+var shouldEscape = should_escape;
 export {
+  beautify,
+  emoji,
+  isCombiningMark,
   namehash,
-  normalise
+  normalise,
+  normalizeFragment,
+  shouldEscape,
+  split,
+  tokenise
 };

package/dist/types/contracts/baseRegistrar.d.ts

@@ -1,3 +1,3 @@
 import type { JsonRpcProvider } from '@ethersproject/providers';
-declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated/BaseRegistrarImplementation").BaseRegistrarImplementation;
+declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated").BaseRegistrarImplementation;
 export default _default;

package/dist/types/contracts/bulkRenewal.d.ts

@@ -1,3 +1,3 @@
 import type { JsonRpcProvider } from '@ethersproject/providers';
-declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated/BulkRenewal").BulkRenewal;
+declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated").BulkRenewal;
 export default _default;

package/dist/types/contracts/dnsRegistrar.d.ts

@@ -1,3 +1,3 @@
 import type { JsonRpcProvider } from '@ethersproject/providers';
-declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated/DNSRegistrar").DNSRegistrar;
+declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated").DNSRegistrar;
 export default _default;

package/dist/types/contracts/ethRegistrarController.d.ts

@@ -1,3 +1,3 @@
 import type { JsonRpcProvider } from '@ethersproject/providers';
-declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated/ETHRegistrarController").ETHRegistrarController;
+declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated").ETHRegistrarController;
 export default _default;

package/dist/types/contracts/multicall.d.ts

@@ -1,3 +1,3 @@
 import type { JsonRpcProvider } from '@ethersproject/providers';
-declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated/Multicall").Multicall;
+declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated").Multicall;
 export default _default;

package/dist/types/contracts/nameWrapper.d.ts

@@ -1,3 +1,3 @@
 import type { JsonRpcProvider } from '@ethersproject/providers';
-declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated/NameWrapper").NameWrapper;
+declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated").NameWrapper;
 export default _default;

package/dist/types/contracts/publicResolver.d.ts

@@ -1,3 +1,3 @@
 import type { JsonRpcProvider } from '@ethersproject/providers';
-declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated/PublicResolver").PublicResolver;
+declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated").PublicResolver;
 export default _default;

package/dist/types/contracts/registry.d.ts

@@ -1,3 +1,3 @@
 import type { JsonRpcProvider } from '@ethersproject/providers';
-declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated/ENSRegistry").ENSRegistry;
+declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated").ENSRegistry;
 export default _default;

package/dist/types/contracts/reverseRegistrar.d.ts

@@ -1,3 +1,3 @@
 import type { JsonRpcProvider } from '@ethersproject/providers';
-declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated/ReverseRegistrar").ReverseRegistrar;
+declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated").ReverseRegistrar;
 export default _default;

package/dist/types/contracts/universalResolver.d.ts

@@ -1,3 +1,3 @@
 import type { JsonRpcProvider } from '@ethersproject/providers';
-declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated/UniversalResolver").UniversalResolver;
+declare const _default: (provider: JsonRpcProvider, address: string) => import("../generated").UniversalResolver;
 export default _default;

package/dist/types/functions/getWrapperData.d.ts

@@ -32,7 +32,6 @@ declare const _default: {
             CAN_DO_EVERYTHING: boolean;
             unnamed: {
                 1024: boolean;
-                64: boolean;
                 128: boolean;
                 256: boolean;
                 512: boolean;
@@ -48,6 +47,7 @@ declare const _default: {
             CANNOT_SET_RESOLVER: boolean;
             CANNOT_SET_TTL: boolean;
             CANNOT_CREATE_SUBDOMAIN: boolean;
+            CANNOT_APPROVE: boolean;
         };
     } | undefined>;
 };

package/dist/types/index.d.ts

@@ -271,7 +271,6 @@ export declare class ENS {
                 CAN_DO_EVERYTHING: boolean;
                 unnamed: {
                     1024: boolean;
-                    64: boolean;
                     128: boolean;
                     256: boolean;
                     512: boolean;
@@ -287,6 +286,7 @@ export declare class ENS {
                 CANNOT_SET_RESOLVER: boolean;
                 CANNOT_SET_TTL: boolean;
                 CANNOT_CREATE_SUBDOMAIN: boolean;
+                CANNOT_APPROVE: boolean;
             };
         } | undefined>;
     }>;
@@ -508,7 +508,6 @@ export declare class ENS {
                     CAN_DO_EVERYTHING: boolean;
                     unnamed: {
                         1024: boolean;
-                        64: boolean;
                         128: boolean;
                         256: boolean;
                         512: boolean;
@@ -524,6 +523,7 @@ export declare class ENS {
                     CANNOT_SET_RESOLVER: boolean;
                     CANNOT_SET_TTL: boolean;
                     CANNOT_CREATE_SUBDOMAIN: boolean;
+                    CANNOT_APPROVE: boolean;
                 };
             };
             expiryDate: Date;

package/dist/types/utils/fuses.d.ts

@@ -8,6 +8,7 @@ export declare const childFuseEnum: {
     readonly CANNOT_SET_RESOLVER: 8;
     readonly CANNOT_SET_TTL: 16;
     readonly CANNOT_CREATE_SUBDOMAIN: 32;
+    readonly CANNOT_APPROVE: 64;
 };
 export declare const parentFuseEnum: {
     PARENT_CANNOT_CONTROL: number;
@@ -27,6 +28,7 @@ export declare const userSettableFuseEnum: {
     readonly CANNOT_SET_RESOLVER: 8;
     readonly CANNOT_SET_TTL: 16;
     readonly CANNOT_CREATE_SUBDOMAIN: 32;
+    readonly CANNOT_APPROVE: 64;
 };
 export declare const fullFuseEnum: {
     CAN_DO_EVERYTHING: number;
@@ -39,14 +41,15 @@ export declare const fullFuseEnum: {
     CANNOT_SET_RESOLVER: 8;
     CANNOT_SET_TTL: 16;
     CANNOT_CREATE_SUBDOMAIN: 32;
+    CANNOT_APPROVE: 64;
 };
-export declare const unnamedChildFuses: readonly [64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768];
+export declare const unnamedChildFuses: readonly [128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768];
 export declare const unnamedParentFuses: readonly [524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864, 134217728, 268435456, 536870912, 1073741824, 2147483648];
-export declare const unnamedUserSettableFuses: readonly [64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864, 134217728, 268435456, 536870912, 1073741824, 2147483648];
-export declare const childFuseKeys: ("CANNOT_UNWRAP" | "CANNOT_BURN_FUSES" | "CANNOT_TRANSFER" | "CANNOT_SET_RESOLVER" | "CANNOT_SET_TTL" | "CANNOT_CREATE_SUBDOMAIN")[];
+export declare const unnamedUserSettableFuses: readonly [128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864, 134217728, 268435456, 536870912, 1073741824, 2147483648];
+export declare const childFuseKeys: ("CANNOT_UNWRAP" | "CANNOT_BURN_FUSES" | "CANNOT_TRANSFER" | "CANNOT_SET_RESOLVER" | "CANNOT_SET_TTL" | "CANNOT_CREATE_SUBDOMAIN" | "CANNOT_APPROVE")[];
 export declare const parentFuseKeys: ("PARENT_CANNOT_CONTROL" | "CAN_EXTEND_EXPIRY")[];
 export declare const fullParentFuseKeys: ("PARENT_CANNOT_CONTROL" | "CAN_EXTEND_EXPIRY" | "IS_DOT_ETH")[];
-export declare const userSettableFuseKeys: ("CANNOT_UNWRAP" | "CANNOT_BURN_FUSES" | "CANNOT_TRANSFER" | "CANNOT_SET_RESOLVER" | "CANNOT_SET_TTL" | "CANNOT_CREATE_SUBDOMAIN" | "PARENT_CANNOT_CONTROL" | "CAN_EXTEND_EXPIRY")[];
+export declare const userSettableFuseKeys: ("CANNOT_UNWRAP" | "CANNOT_BURN_FUSES" | "CANNOT_TRANSFER" | "CANNOT_SET_RESOLVER" | "CANNOT_SET_TTL" | "CANNOT_CREATE_SUBDOMAIN" | "CANNOT_APPROVE" | "PARENT_CANNOT_CONTROL" | "CAN_EXTEND_EXPIRY")[];
 declare type FuseType<Enum extends Record<string, number>, UnnamedTuple extends readonly number[], CustomFuses extends string = never> = {
     fuse: keyof Enum;
     options: {
@@ -110,7 +113,6 @@ export declare const decodeFuses: (fuses: number) => {
         CAN_DO_EVERYTHING: boolean;
         unnamed: {
             1024: boolean;
-            64: boolean;
             128: boolean;
             256: boolean;
             512: boolean;
@@ -126,6 +128,7 @@ export declare const decodeFuses: (fuses: number) => {
         CANNOT_SET_RESOLVER: boolean;
         CANNOT_SET_TTL: boolean;
         CANNOT_CREATE_SUBDOMAIN: boolean;
+        CANNOT_APPROVE: boolean;
     };
 };
 export declare const checkPCCBurned: (fuses: number) => boolean;

package/dist/types/utils/normalise.d.ts

@@ -1,2 +1,11 @@
-export declare const normalise: (name: string) => any;
+import { DisallowedToken, EmojiToken, ens_beautify, ens_emoji, ens_normalize_fragment, ens_split, ens_tokenize, IgnoredToken, is_combining_mark, Label, MappedToken, NFCToken, should_escape, StopToken, TextToken, Token, ValidToken } from '@adraffy/ens-normalize';
+export declare const normalise: (name: string) => string;
 export declare const namehash: (name: string) => string;
+export declare const beautify: typeof ens_beautify;
+export declare const emoji: typeof ens_emoji;
+export declare const normalizeFragment: typeof ens_normalize_fragment;
+export declare const split: typeof ens_split;
+export declare const tokenise: typeof ens_tokenize;
+export declare const isCombiningMark: typeof is_combining_mark;
+export declare const shouldEscape: typeof should_escape;
+export type { DisallowedToken, EmojiToken, IgnoredToken, Label, MappedToken, NFCToken, StopToken, TextToken, Token, ValidToken, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ensdomains/ensjs",
-  "version": "3.0.0-alpha.51",
+  "version": "3.0.0-alpha.52",
   "description": "ENS javascript library for contract interaction",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.mjs",
@@ -59,6 +59,7 @@
   "author": "TateB <yo@taytems.xyz>",
   "license": "MIT",
   "dependencies": {
+    "@adraffy/ens-normalize": "1.9.0",
     "@ensdomains/address-encoder": "^0.2.18",
     "@ensdomains/content-hash": "^2.5.7",
     "@ensdomains/dnsprovejs": "^0.4.1",
@@ -67,7 +68,6 @@
     "dns-packet": "^5.3.1",
     "graphql": "^16.3.0",
     "graphql-request": "5.1.0",
-    "idna-uts46-hx": "3.4.0",
     "pako": "^2.1.0",
     "traverse": "^0.6.6"
   },

package/src/functions/getWrapperData.test.ts

@@ -40,7 +40,12 @@ describe('getWrapperData', () => {
   })
   it('should return with other correct fuses', async () => {
     const tx = await ensInstance.setFuses('wrapped.eth', {
-      named: ['CANNOT_UNWRAP', 'CANNOT_CREATE_SUBDOMAIN', 'CANNOT_SET_TTL'],
+      named: [
+        'CANNOT_UNWRAP',
+        'CANNOT_CREATE_SUBDOMAIN',
+        'CANNOT_SET_TTL',
+        'CANNOT_APPROVE',
+      ],
       addressOrIndex: 1,
     })
     await tx.wait()
@@ -52,6 +57,7 @@ describe('getWrapperData', () => {
       expect(result.child.CANNOT_UNWRAP).toBe(true)
       expect(result.child.CANNOT_CREATE_SUBDOMAIN).toBe(true)
       expect(result.child.CANNOT_SET_TTL).toBe(true)
+      expect(result.child.CANNOT_APPROVE).toBe(true)
       expect(result.parent.IS_DOT_ETH).toBe(true)
     }
   })

package/src/functions/setFuses.test.ts

@@ -74,7 +74,12 @@ describe('setFuses', () => {
   describe('Array', () => {
     it('should return a setFuses transaction from a named fuse array and succeed', async () => {
       const tx = await ensInstance.setFuses('wrapped.eth', {
-        named: ['CANNOT_UNWRAP', 'CANNOT_CREATE_SUBDOMAIN', 'CANNOT_SET_TTL'],
+        named: [
+          'CANNOT_UNWRAP',
+          'CANNOT_CREATE_SUBDOMAIN',
+          'CANNOT_SET_TTL',
+          'CANNOT_APPROVE',
+        ],
         addressOrIndex: accounts[1],
       })
       expect(tx).toBeTruthy()
@@ -87,6 +92,7 @@ describe('setFuses', () => {
         'CANNOT_CREATE_SUBDOMAIN',
         'CANNOT_SET_TTL',
         'PARENT_CANNOT_CONTROL',
+        'CANNOT_APPROVE',
       ])
     })
     it('should return a setFuses transaction from an unnamed fuse array and succeed', async () => {
@@ -110,7 +116,12 @@ describe('setFuses', () => {
     })
     it('should return a setFuses transaction from both an unnamed and named fuse array and succeed', async () => {
       const tx = await ensInstance.setFuses('wrapped.eth', {
-        named: ['CANNOT_UNWRAP', 'CANNOT_CREATE_SUBDOMAIN', 'CANNOT_SET_TTL'],
+        named: [
+          'CANNOT_UNWRAP',
+          'CANNOT_CREATE_SUBDOMAIN',
+          'CANNOT_SET_TTL',
+          'CANNOT_APPROVE',
+        ],
         unnamed: [128, 256, 512],
         addressOrIndex: accounts[1],
       })
@@ -124,6 +135,7 @@ describe('setFuses', () => {
         'CANNOT_CREATE_SUBDOMAIN',
         'CANNOT_SET_TTL',
         'PARENT_CANNOT_CONTROL',
+        'CANNOT_APPROVE',
       ])
       checkUnnamedFuses(fuses, [128, 256, 512])
     })
@@ -154,7 +166,7 @@ describe('setFuses', () => {
   describe('Number', () => {
     it('should return a setFuses transaction from a number and succeed', async () => {
       const tx = await ensInstance.setFuses('wrapped.eth', {
-        number: 49,
+        number: 113,
         addressOrIndex: accounts[1],
       })
       expect(tx).toBeTruthy()
@@ -166,6 +178,7 @@ describe('setFuses', () => {
         'CANNOT_UNWRAP',
         'CANNOT_CREATE_SUBDOMAIN',
         'CANNOT_SET_TTL',
+        'CANNOT_APPROVE',
         'PARENT_CANNOT_CONTROL',
       ])
     })
@@ -224,7 +237,7 @@ describe('setChildFuses', () => {
     const tx = await ensInstance.setChildFuses(
       'test.wrapped-with-subnames.eth',
       {
-        fuses: 65537,
+        fuses: 65537 + 64,
         addressOrIndex: accounts[1],
       },
     )
@@ -235,6 +248,10 @@ describe('setChildFuses', () => {
       namehash('test.wrapped-with-subnames.eth'),
     )
 
-    checkFuses(fuses, ['CANNOT_UNWRAP', 'PARENT_CANNOT_CONTROL'])
+    checkFuses(fuses, [
+      'CANNOT_UNWRAP',
+      'PARENT_CANNOT_CONTROL',
+      'CANNOT_APPROVE',
+    ])
   })
 })

package/src/utils/fuses.ts

@@ -5,6 +5,7 @@ const CANNOT_TRANSFER = 4
 const CANNOT_SET_RESOLVER = 8
 const CANNOT_SET_TTL = 16
 const CANNOT_CREATE_SUBDOMAIN = 32
+const CANNOT_APPROVE = 64
 
 // parent named fuses
 const PARENT_CANNOT_CONTROL = 0x10000
@@ -26,6 +27,7 @@ export const childFuseEnum = {
   CANNOT_SET_RESOLVER,
   CANNOT_SET_TTL,
   CANNOT_CREATE_SUBDOMAIN,
+  CANNOT_APPROVE,
 } as const
 
 export const parentFuseEnum = {
@@ -50,7 +52,7 @@ export const fullFuseEnum = {
 }
 
 export const unnamedChildFuses = [
-  64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768,
+  128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768,
 ] as const
 
 export const unnamedParentFuses = [

package/src/utils/normalise.ts

@@ -1,14 +1,32 @@
+import {
+  DisallowedToken,
+  EmojiToken,
+  ens_beautify,
+  ens_emoji,
+  ens_normalize,
+  ens_normalize_fragment,
+  ens_split,
+  ens_tokenize,
+  IgnoredToken,
+  is_combining_mark,
+  Label,
+  MappedToken,
+  NFCToken,
+  should_escape,
+  StopToken,
+  TextToken,
+  Token,
+  ValidToken,
+} from '@adraffy/ens-normalize'
 import { concat, hexlify } from '@ethersproject/bytes'
 import { keccak256 } from '@ethersproject/keccak256'
 import { toUtf8Bytes } from '@ethersproject/strings'
-import uts46 from 'idna-uts46-hx/uts46bundle.js'
 import { decodeLabelhash, isEncodedLabelhash } from './labels'
 
 const zeros = new Uint8Array(32)
 zeros.fill(0)
 
-export const normalise = (name: string) =>
-  name ? uts46.toUnicode(name, { useStd3ASCII: true }) : name
+export const normalise = (name: string) => (name ? ens_normalize(name) : name)
 
 export const namehash = (name: string): string => {
   let result: string | Uint8Array = zeros
@@ -33,3 +51,24 @@ export const namehash = (name: string): string => {
 
   return result as string
 }
+
+export const beautify = ens_beautify
+export const emoji = ens_emoji
+export const normalizeFragment = ens_normalize_fragment
+export const split = ens_split
+export const tokenise = ens_tokenize
+export const isCombiningMark = is_combining_mark
+export const shouldEscape = should_escape
+
+export type {
+  DisallowedToken,
+  EmojiToken,
+  IgnoredToken,
+  Label,
+  MappedToken,
+  NFCToken,
+  StopToken,
+  TextToken,
+  Token,
+  ValidToken,
+}

package/src/@types/idna-uts46-hx.d.ts

@@ -1 +0,0 @@
-declare module 'idna-uts46-hx/uts46bundle.js'