@ensdomains/ensjs 3.0.0-alpha.15 → 3.0.0-alpha.16

package/dist/cjs/GqlManager.d.ts

@@ -1,6 +1,8 @@
-export declare const enter: (node: any) => any;
-export declare const requestMiddleware: (visit: any, parse: any) => (request: any) => any;
-export declare const responseMiddleware: (traverse: any) => (response: any) => any;
+import type { parse as Parse, print as Print, SelectionSetNode, visit as Visit } from 'graphql';
+import type Traverse from 'traverse';
+export declare const enter: (node: SelectionSetNode) => SelectionSetNode | undefined;
+export declare const requestMiddleware: (visit: typeof Visit, parse: typeof Parse, print: typeof Print) => (request: any) => any;
+export declare const responseMiddleware: (traverse: typeof Traverse) => (response: any) => any;
 export default class GqlManager {
     gql: any;
     client?: any | null;

package/dist/cjs/GqlManager.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.responseMiddleware = exports.requestMiddleware = exports.enter = void 0;
-// @ts-nocheck
 const normalise_1 = require("./utils/normalise");
 const generateSelection = (selection) => ({
     kind: 'Field',
@@ -38,25 +37,34 @@ const generateSelection = (selection) => ({
     selectionSet: undefined,
 });
 const enter = (node) => {
-    if (node.kind === 'SelectionSet') {
-        const id = node.selections.find((x) => x.name && x.name.value === 'id');
-        const name = node.selections.find((x) => x.name && x.name.value === 'name');
-        if (!id && name) {
-            node.selections = [...node.selections, generateSelection('id')];
-            return node;
+    let hasName = false;
+    let hasId = false;
+    for (const selection of node.selections) {
+        if ('name' in selection) {
+            if (selection.name.value === 'name')
+                hasName = true;
+            else if (selection.name.value === 'id')
+                hasId = true;
         }
     }
+    if (hasName && !hasId) {
+        node.selections = [...node.selections, generateSelection('id')];
+        return node;
+    }
 };
 exports.enter = enter;
-const requestMiddleware = (visit, parse) => (request) => {
+const requestMiddleware = (visit, parse, print) => (request) => {
     const requestBody = JSON.parse(request.body);
     const rawQuery = requestBody.query;
     const parsedQuery = parse(rawQuery);
-    const updatedQuery = visit(parsedQuery, { enter: exports.enter });
-    const updatedBody = { ...requestBody, query: updatedQuery.loc.source.body };
+    const updatedQuery = visit(parsedQuery, {
+        SelectionSet: {
+            enter: exports.enter,
+        },
+    });
     return {
         ...request,
-        body: JSON.stringify(updatedBody),
+        body: JSON.stringify({ ...requestBody, query: print(updatedQuery) }),
     };
 };
 exports.requestMiddleware = requestMiddleware;
@@ -81,13 +89,13 @@ class GqlManager {
     client = null;
     setUrl = async (url) => {
         if (url) {
-            const [imported, traverse, { visit, parse }] = await Promise.all([
+            const [imported, traverse, { visit, parse, print }] = await Promise.all([
                 Promise.resolve().then(() => __importStar(require('graphql-request'))),
                 Promise.resolve().then(() => __importStar(require('traverse'))),
                 Promise.resolve().then(() => __importStar(require('graphql/language'))),
             ]);
             this.client = new imported.GraphQLClient(url, {
-                requestMiddleware: (0, exports.requestMiddleware)(visit, parse),
+                requestMiddleware: (0, exports.requestMiddleware)(visit, parse, print),
                 responseMiddleware: (0, exports.responseMiddleware)(traverse.default),
             });
             this.gql = imported.gql;

package/dist/esm/GqlManager.d.ts

@@ -1,6 +1,8 @@
-export declare const enter: (node: any) => any;
-export declare const requestMiddleware: (visit: any, parse: any) => (request: any) => any;
-export declare const responseMiddleware: (traverse: any) => (response: any) => any;
+import type { parse as Parse, print as Print, SelectionSetNode, visit as Visit } from 'graphql';
+import type Traverse from 'traverse';
+export declare const enter: (node: SelectionSetNode) => SelectionSetNode | undefined;
+export declare const requestMiddleware: (visit: typeof Visit, parse: typeof Parse, print: typeof Print) => (request: any) => any;
+export declare const responseMiddleware: (traverse: typeof Traverse) => (response: any) => any;
 export default class GqlManager {
     gql: any;
     client?: any | null;

package/dist/esm/GqlManager.js

@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { namehash } from './utils/normalise';
 const generateSelection = (selection) => ({
     kind: 'Field',
@@ -12,24 +11,33 @@ const generateSelection = (selection) => ({
     selectionSet: undefined,
 });
 export const enter = (node) => {
-    if (node.kind === 'SelectionSet') {
-        const id = node.selections.find((x) => x.name && x.name.value === 'id');
-        const name = node.selections.find((x) => x.name && x.name.value === 'name');
-        if (!id && name) {
-            node.selections = [...node.selections, generateSelection('id')];
-            return node;
+    let hasName = false;
+    let hasId = false;
+    for (const selection of node.selections) {
+        if ('name' in selection) {
+            if (selection.name.value === 'name')
+                hasName = true;
+            else if (selection.name.value === 'id')
+                hasId = true;
         }
     }
+    if (hasName && !hasId) {
+        node.selections = [...node.selections, generateSelection('id')];
+        return node;
+    }
 };
-export const requestMiddleware = (visit, parse) => (request) => {
+export const requestMiddleware = (visit, parse, print) => (request) => {
     const requestBody = JSON.parse(request.body);
     const rawQuery = requestBody.query;
     const parsedQuery = parse(rawQuery);
-    const updatedQuery = visit(parsedQuery, { enter });
-    const updatedBody = { ...requestBody, query: updatedQuery.loc.source.body };
+    const updatedQuery = visit(parsedQuery, {
+        SelectionSet: {
+            enter,
+        },
+    });
     return {
         ...request,
-        body: JSON.stringify(updatedBody),
+        body: JSON.stringify({ ...requestBody, query: print(updatedQuery) }),
     };
 };
 export const responseMiddleware = (traverse) => (response) => {
@@ -53,13 +61,13 @@ export default class GqlManager {
         this.client = null;
         this.setUrl = async (url) => {
             if (url) {
-                const [imported, traverse, { visit, parse }] = await Promise.all([
+                const [imported, traverse, { visit, parse, print }] = await Promise.all([
                     import('graphql-request'),
                     import('traverse'),
                     import('graphql/language'),
                 ]);
                 this.client = new imported.GraphQLClient(url, {
-                    requestMiddleware: requestMiddleware(visit, parse),
+                    requestMiddleware: requestMiddleware(visit, parse, print),
                     responseMiddleware: responseMiddleware(traverse.default),
                 });
                 this.gql = imported.gql;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ensdomains/ensjs",
-  "version": "3.0.0-alpha.15",
+  "version": "3.0.0-alpha.16",
   "description": "ENS javascript library for contract interaction",
   "main": "./dist/cjs/index.js",
   "types": "./dist/cjs/index.d.ts",

package/src/GqlManager.test.ts

@@ -1,7 +1,7 @@
+import { parse, print, visit } from 'graphql'
 import traverse from 'traverse'
-import { visit, parse } from 'graphql'
 
-import { requestMiddleware, responseMiddleware, enter } from './GqlManager'
+import { requestMiddleware, responseMiddleware } from './GqlManager'
 import { namehash } from './utils/normalise'
 
 describe('GqlManager', () => {
@@ -153,8 +153,9 @@ query getNames($id: ID!, $expiryDate: Int) {
 
   describe('requestMiddleware', () => {
     it('should add id to a SelectionSet if name is present and id is not', () => {
-      const result = requestMiddleware(visit, parse)(mockRequest)
-      expect(result.body.includes('id')).toBe(true)
+      const result = requestMiddleware(visit, parse, print)(mockRequest)
+      const body = result.body as string
+      expect(body.match(/domain.*id.*id.*domains.*id.*id/)?.length).toBe(1)
     })
   })
   describe('responseMiddleware', () => {

package/src/GqlManager.ts

@@ -1,10 +1,17 @@
-// @ts-nocheck
+import type {
+  Kind,
+  parse as Parse,
+  print as Print,
+  SelectionSetNode,
+  visit as Visit,
+} from 'graphql'
+import type Traverse from 'traverse'
 import { namehash } from './utils/normalise'
 
 const generateSelection = (selection: any) => ({
-  kind: 'Field',
+  kind: 'Field' as Kind.FIELD,
   name: {
-    kind: 'Name',
+    kind: 'Name' as Kind.NAME,
     value: selection,
   },
   arguments: [],
@@ -13,47 +20,58 @@ const generateSelection = (selection: any) => ({
   selectionSet: undefined,
 })
 
-export const enter = (node: any) => {
-  if (node.kind === 'SelectionSet') {
-    const id = node.selections.find((x) => x.name && x.name.value === 'id')
-    const name = node.selections.find((x) => x.name && x.name.value === 'name')
+export const enter = (node: SelectionSetNode) => {
+  let hasName = false
+  let hasId = false
 
-    if (!id && name) {
-      node.selections = [...node.selections, generateSelection('id')]
-      return node
+  for (const selection of node.selections) {
+    if ('name' in selection) {
+      if (selection.name.value === 'name') hasName = true
+      else if (selection.name.value === 'id') hasId = true
     }
   }
+
+  if (hasName && !hasId) {
+    node.selections = [...node.selections, generateSelection('id')]
+    return node
+  }
 }
 
-export const requestMiddleware = (visit, parse) => (request: any) => {
-  const requestBody = JSON.parse(request.body)
-  const rawQuery = requestBody.query
-  const parsedQuery = parse(rawQuery)
-  const updatedQuery = visit(parsedQuery, { enter })
-  const updatedBody = { ...requestBody, query: updatedQuery.loc.source.body }
+export const requestMiddleware =
+  (visit: typeof Visit, parse: typeof Parse, print: typeof Print) =>
+  (request: any) => {
+    const requestBody = JSON.parse(request.body)
+    const rawQuery = requestBody.query
+    const parsedQuery = parse(rawQuery)
+    const updatedQuery = visit(parsedQuery, {
+      SelectionSet: {
+        enter,
+      },
+    })
 
-  return {
-    ...request,
-    body: JSON.stringify(updatedBody),
+    return {
+      ...request,
+      body: JSON.stringify({ ...requestBody, query: print(updatedQuery) }),
+    }
   }
-}
 
-export const responseMiddleware = (traverse) => (response: any) => {
-  traverse(response).forEach(function (responseItem: any) {
-    if (responseItem instanceof Object && responseItem.name) {
-      //Name already in hashed form
-      if (responseItem.name && responseItem.name.includes('[')) {
-        return
-      }
+export const responseMiddleware =
+  (traverse: typeof Traverse) => (response: any) => {
+    traverse(response).forEach(function (responseItem: any) {
+      if (responseItem instanceof Object && responseItem.name) {
+        //Name already in hashed form
+        if (responseItem.name && responseItem.name.includes('[')) {
+          return
+        }
 
-      const hashedName = namehash(responseItem.name)
-      if (responseItem.id !== hashedName) {
-        this.update({ ...responseItem, name: hashedName, invalidName: true })
+        const hashedName = namehash(responseItem.name)
+        if (responseItem.id !== hashedName) {
+          this.update({ ...responseItem, name: hashedName, invalidName: true })
+        }
       }
-    }
-  })
-  return response
-}
+    })
+    return response
+  }
 
 export default class GqlManager {
   public gql: any = () => null
@@ -61,14 +79,14 @@ export default class GqlManager {
 
   public setUrl = async (url: string | null) => {
     if (url) {
-      const [imported, traverse, { visit, parse }] = await Promise.all([
+      const [imported, traverse, { visit, parse, print }] = await Promise.all([
         import('graphql-request'),
         import('traverse'),
         import('graphql/language'),
       ])
 
       this.client = new imported.GraphQLClient(url, {
-        requestMiddleware: requestMiddleware(visit, parse),
+        requestMiddleware: requestMiddleware(visit, parse, print),
         responseMiddleware: responseMiddleware(traverse.default),
       })
       this.gql = imported.gql