Add __typename to root operations, too.

As @jbaxleyiii pointed out in this comment, the root query and mutation types do not necessarily have to be called "Query" or "Mutation", and the only way to find their real names is to ask for the __typename property: #5146 (comment)
apollographql · Aug 9, 2019 · 4377e02 · 4377e02
1 parent d53f118
commit 4377e02
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/packages/apollo-cache-inmemory/src/__tests__/fragmentMatcher.ts b/packages/apollo-cache-inmemory/src/__tests__/fragmentMatcher.ts
@@ -29,6 +29,7 @@ describe('fragment matching', () => {
     `;
 
     const data = {
+      __typename: 'Query',
       animals: [
         {
           __typename: 'Cat',
@@ -73,6 +74,7 @@ describe('fragment matching', () => {
     `;
 
     const data = {
+      __typename: 'Query',
       bestFriend: {
         __typename: 'Dog',
         id: 2,
@@ -109,6 +111,7 @@ describe('fragment matching', () => {
     `;
 
     const data = {
+      __typename: 'Query',
       testResults: [
         {
           __typename: 'TestResult',
@@ -160,6 +163,7 @@ describe('fragment matching', () => {
     `;
 
     const data = {
+      __typename: 'Query',
       animals: [
         {
           __typename: 'Sphynx',
@@ -204,6 +208,7 @@ describe('fragment matching', () => {
     `;
 
     const data = {
+      __typename: 'Query',
       people: [
         {
           __typename: 'Person',

diff --git a/packages/apollo-utilities/src/__tests__/transform.ts b/packages/apollo-utilities/src/__tests__/transform.ts
@@ -554,6 +554,7 @@ describe('query transforms', () => {
           }
           __typename
         }
+        __typename
       }
     `;
     const expectedQueryStr = print(expectedQuery);
@@ -564,6 +565,7 @@ describe('query transforms', () => {
   it('should not add duplicates', () => {
     let testQuery = gql`
       query {
+        __typename
         author {
           name {
             firstName
@@ -577,6 +579,7 @@ describe('query transforms', () => {
 
     const expectedQuery = gql`
       query {
+        __typename
         author {
           name {
             firstName
@@ -611,6 +614,7 @@ describe('query transforms', () => {
           }
           __typename
         }
+        __typename
       }
     `);
     const modifiedQuery = addTypenameToDocument(testQuery);
@@ -644,6 +648,7 @@ describe('query transforms', () => {
           }
           __typename
         }
+        __typename
       }
 
       fragment friendFields on User {
@@ -673,6 +678,7 @@ describe('query transforms', () => {
           lastName
           __typename
         }
+        __typename
       }
     `);
 
@@ -696,6 +702,7 @@ describe('query transforms', () => {
           lastName
           __typename
         }
+        __typename
       }
     `;
 
@@ -768,6 +775,7 @@ describe('query transforms', () => {
           }
           __typename
         }
+        __typename
       }
     `);
     const modifiedQuery = addTypenameToDocument(testQuery);

diff --git a/packages/apollo-utilities/src/transform.ts b/packages/apollo-utilities/src/transform.ts
@@ -211,14 +211,6 @@ export function addTypenameToDocument(doc: DocumentNode): DocumentNode {
   return visit(checkDocument(doc), {
     SelectionSet: {
       enter(node, _key, parent) {
-        // Don't add __typename to OperationDefinitions.
-        if (
-          parent &&
-          (parent as OperationDefinitionNode).kind === 'OperationDefinition'
-        ) {
-          return;
-        }
-
         // No changes if no selections.
         const { selections } = node;
         if (!selections) {