Prevent adding __typename to toplevel operations (#399)

urql-graphql · Aug 21, 2019 · 6685f43 · 6685f43
1 parent fc6fccd
commit 6685f43
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/src/utils/typenames.test.ts b/src/utils/typenames.test.ts
@@ -14,7 +14,6 @@ describe('formatTypeNames', () => {
           id
           __typename
         }
-        __typename
       }
       "
     `);
@@ -29,15 +28,15 @@ describe('formatTypeNames', () => {
       __typename
     }`)
     ).toMatchInlineSnapshot(`
-            "{
-              todos {
-                id
-                __typename
-              }
-              __typename
-            }
-            "
-        `);
+                  "{
+                    todos {
+                      id
+                      __typename
+                    }
+                    __typename
+                  }
+                  "
+            `);
   });
 });
 

diff --git a/src/utils/typenames.ts b/src/utils/typenames.ts
@@ -2,7 +2,7 @@ import {
   DocumentNode,
   FieldNode,
   InlineFragmentNode,
-  OperationDefinitionNode,
+  Kind,
   visit,
 } from 'graphql';
 
@@ -35,9 +35,7 @@ const collectTypes = (obj: EntityLike | EntityLike[], types: string[] = []) => {
 export const collectTypesFromResponse = (response: object) =>
   collectTypes(response as EntityLike).filter((v, i, a) => a.indexOf(v) === i);
 
-const formatNode = (
-  n: FieldNode | InlineFragmentNode | OperationDefinitionNode
-) => {
+const formatNode = (n: FieldNode | InlineFragmentNode) => {
   if (n.selectionSet === undefined) {
     return false;
   }
@@ -57,9 +55,9 @@ const formatNode = (
       selections: [
         ...n.selectionSet.selections,
         {
-          kind: 'Field',
+          kind: Kind.FIELD,
           name: {
-            kind: 'Name',
+            kind: Kind.NAME,
             value: '__typename',
           },
         },
@@ -72,5 +70,4 @@ export const formatDocument = (astNode: DocumentNode) =>
   visit(astNode, {
     Field: formatNode,
     InlineFragment: formatNode,
-    OperationDefinition: formatNode,
   });