fix: tidy up after self-review

Author: shrugs

apps/ensapi/src/omnigraph-api/schema/resolver.ts

@@ -3,7 +3,6 @@ import config from "@/config";
 import { type ResolveCursorConnectionArgs, resolveCursorConnection } from "@pothos/plugin-relay";
 import { and, eq } from "drizzle-orm";
 import {
-  asInterpretedName,
   makePermissionsId,
   makeResolverRecordsId,
   namehashInterpretedName,
@@ -114,7 +113,7 @@ ResolverRef.implement({
       args: { for: t.arg({ type: NameOrNodeInput, required: true }) },
       nullable: true,
       resolve: async ({ chainId, address }, args) => {
-        const node = args.for.node ?? namehashInterpretedName(asInterpretedName(args.for.name));
+        const node = args.for.node ?? namehashInterpretedName(args.for.name);
         return makeResolverRecordsId({ chainId, address }, node);
       },
     }),

apps/ensindexer/src/lib/managed-names.test.ts

@@ -1,4 +1,4 @@
-import { type AccountId, asInterpretedName, namehashInterpretedName } from "enssdk";
+import { type AccountId, ETH_NODE } from "enssdk";
 import { zeroAddress } from "viem";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -37,8 +37,6 @@ const controller = getDatasourceContract(
   "LegacyEthRegistrarController",
 );
 
-const ETH_NODE = namehashInterpretedName(asInterpretedName("eth"));
-
 describe("managed-names", () => {
   beforeEach(() => {
     vi.resetAllMocks();

apps/ensindexer/src/lib/managed-names.ts

@@ -152,7 +152,9 @@ export const getManagedName = (contract: AccountId): { name: InterpretedName; no
       const namespaceSpecific = MANAGED_NAME_BY_NAMESPACE[config.namespace]?.[managedName];
 
       // use the namespace-specific Managed Name if specified, otherwise use the default from CONTRACTS_BY_MANAGED_NAME
-      const name = asInterpretedName(namespaceSpecific ?? managedName);
+      // NOTE: we cast to InterpretedName directly to avoid the overhead of asInterpretedName and
+      // both namespaceSpecific and managedName are guaranteed to be InterpretedName (see above)
+      const name = (namespaceSpecific ?? managedName) as InterpretedName;
       const node = cachedNamehash(name);
 
       return { name, node };

apps/ensindexer/src/plugins/subgraph/shared-handlers/ThreeDNSToken.ts

@@ -80,7 +80,7 @@ function decodeFQDN(fqdn: DNSEncodedLiteralName): {
   }
 
   // due the invariant above, we know that all of the labels are normalized (and therefore Interpreted Labels)
-  const interpretedLabels = literalLabels.map((l) => asInterpretedLabel(l));
+  const interpretedLabels = literalLabels.map(asInterpretedLabel);
 
   return {
     // biome-ignore lint/style/noNonNullAssertion: ok due to length invariant above

packages/ensnode-sdk/src/ensapi/client.ts

@@ -410,7 +410,9 @@ export class EnsApiClient {
    *   registrarActionsFilter,
    *   EnsApiClient,
    * } from "@ensnode/ensnode-sdk";
-   * import { namehashInterpretedName } from "enssdk";
+   * import { ETH_NODE, namehashInterpretedName, asInterpretedName } from "enssdk";
+   *
+   * const BASE_NODE = namehashInterpretedName(asInterpretedName("base.eth"));
    *
    * const client: EnsApiClient;
    *
@@ -432,7 +434,7 @@ export class EnsApiClient {
    * // get latest registrar action records associated with
    * // subregistry managing `eth` name
    * await client.registrarActions({
-   *   filters: [registrarActionsFilter.byParentNode(namehash('eth'))],
+   *   filters: [registrarActionsFilter.byParentNode(ETH_NODE)],
    * });
    *
    * // get latest registrar action records which include referral info
@@ -448,7 +450,7 @@ export class EnsApiClient {
    * // get latest 10 registrar action records associated with
    * // subregistry managing `base.eth` name
    * await client.registrarActions({
-   *   filters: [registrarActionsFilter.byParentNode(namehash('base.eth'))],
+   *   filters: [registrarActionsFilter.byParentNode(BASE_NODE)],
    *   recordsPerPage: 10
    * });
    *
@@ -622,17 +624,20 @@ export class EnsApiClient {
    * import {
    *   EnsApiClient,
    * } from "@ensnode/ensnode-sdk";
-   * import { namehashInterpretedName } from "enssdk";
+   * import { namehashInterpretedName, asInterpretedName } from "enssdk";
+   *
+   * const VITALIK_NAME = asInterpretedName("vitalik.eth");
+   * const VITALIK_DOMAIN_ID = namehashInterpretedName(vitalik);
    *
    * const client: EnsApiClient;
    *
    * // get latest name token records from the indexed subregistry based on the requested name
    * const response = await client.nameTokens({
-   *   name: "vitalik.eth"
+   *   name: VITALIK_NAME,
    * });
    *
    * const response = await client.nameTokens({
-   *   domainId: "0xee6c4522aab0003e8d14cd40a6af439055fd2577951148c14b6cea9a53475835" // namehash('vitalik.eth')
+   *   domainId: VITALIK_DOMAIN_ID,
    * })
    * ```
    */

packages/enssdk/src/lib/dns-encoded-name.test.ts

@@ -7,9 +7,7 @@ import { asLiteralLabel } from "./interpreted-names-and-labels";
 import { encodeLabelHash, labelhashLiteralLabel } from "./labelhash";
 import type { DNSEncodedName } from "./types";
 
-const MULTI_BYTE_UNICODE_NAMES = [
-  "\u{1F469}\u{1F3FC}\u200D\u2764\u200D\u{1F48B}\u200D\u{1F468}\u{1F3FC}.eth",
-];
+const MULTI_BYTE_UNICODE_NAMES = ["👩🏼‍❤‍💋‍👨🏼.eth"];
 
 describe("decodeDNSEncodedName", () => {
   it("handles root node", () => {

packages/enssdk/src/lib/interpreted-names-and-labels.test.ts

@@ -10,7 +10,7 @@ import {
   parsePartialInterpretedName,
 } from "./interpreted-names-and-labels";
 import { encodeLabelHash, labelhashLiteralLabel } from "./labelhash";
-import type { InterpretedLabel, InterpretedName, Name } from "./types";
+import type { InterpretedLabel, InterpretedName, LiteralLabel, Name } from "./types";
 
 const ENCODED_LABELHASH_LABEL = /^\[[\da-f]{64}\]$/;
 
@@ -20,9 +20,9 @@ const NORMALIZED_LABELS = [
   "test",
   "eth",
   "base",
-  "\u{1F525}",
-  "test\u{1F382}",
-  "caf\u00E9",
+  "🔥",
+  "test🎂",
+  "café",
   "sub",
   "a".repeat(512), // Long normalized
 ].map(asLiteralLabel);
@@ -91,15 +91,13 @@ describe("interpretation", () => {
     });
 
     it("correctly interprets an empty array of labels", () => {
-      expect(literalLabelsToInterpretedName(([] as string[]).map(asLiteralLabel))).toEqual("");
+      expect(literalLabelsToInterpretedName([] as LiteralLabel[])).toEqual("");
     });
   });
 
   describe("interpretedLabelsToInterpretedName", () => {
     it("correctly interprets an empty array of labels", () => {
-      expect(interpretedLabelsToInterpretedName(([] as string[]).map(asInterpretedLabel))).toEqual(
-        "",
-      );
+      expect(interpretedLabelsToInterpretedName([] as InterpretedLabel[])).toEqual("");
     });
 
     it("correctly interprets a single label", () => {
@@ -111,12 +109,9 @@ describe("interpretation", () => {
       const interpretedLabelThatLooksLikeALabelHash = literalLabelToInterpretedLabel(literalLabel);
 
       expect(
-        interpretedLabelsToInterpretedName([
-          asInterpretedLabel("a"),
-          asInterpretedLabel("b"),
-          asInterpretedLabel("c"),
-          interpretedLabelThatLooksLikeALabelHash,
-        ]),
+        interpretedLabelsToInterpretedName(
+          ["a", "b", "c", interpretedLabelThatLooksLikeALabelHash].map(asInterpretedLabel),
+        ),
       ).toEqual(`a.b.c.${interpretedLabelThatLooksLikeALabelHash}`);
     });
   });
@@ -129,7 +124,7 @@ describe("interpretation", () => {
       ["t", [], "t"],
       ["test", [], "test"],
       ["exam", [], "exam"],
-      ["\u{1F525}", [], "\u{1F525}"],
+      ["🔥", [], "🔥"],
       // concrete TLD with empty partial
       ["eth.", ["eth"], ""],
       ["base.", ["base"], ""],
@@ -198,8 +193,8 @@ describe("interpretation", () => {
       // with encoded labelhash in parent
       ["sub", `${EXAMPLE_ENCODED_LABEL_HASH}.eth`, `sub.${EXAMPLE_ENCODED_LABEL_HASH}.eth`],
       // emoji labels
-      ["\u{1F525}", "eth", "\u{1F525}.eth"],
-      ["wallet", "\u{1F525}.eth", "wallet.\u{1F525}.eth"],
+      ["🔥", "eth", "🔥.eth"],
+      ["wallet", "🔥.eth", "wallet.🔥.eth"],
     ] as [InterpretedLabel, InterpretedName | undefined, InterpretedName][])(
       "constructSubInterpretedName(%j, %j) → %j",
       (label, parent, expected) => {

packages/enssdk/src/lib/normalization.test.ts

@@ -8,9 +8,9 @@ const NORMALIZED_LABELS = [
   "test",
   "eth",
   "base",
-  "\u{1F525}",
-  "test\u{1F382}",
-  "caf\u00E9",
+  "🔥",
+  "test🎂",
+  "café",
   "sub",
   "a".repeat(512), // Long normalized
 ];
@@ -19,8 +19,8 @@ const UNNORMALIZED_LABELS = [
   "VITALIK", // normalizable but not normalized
   "", // empty string
   "abc.123", // contains full-stop
-  "\u0435thchina", // \u0435thchina
-  "\u0435thgold", // same situation
+  "еthchina", // \u0435thchina
+  "еthgold", // same situation
   "Vitalik", // Uppercase
   "Example", // Uppercase
   "TEST", // Uppercase