shrink diff.

movio · Nov 5, 2021 · 3d74958 · 3d74958
1 parent 463d678
commit 3d74958
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/plan.go b/plan.go
@@ -174,6 +174,9 @@ func extractSelectionSet(ctx *PlanningContext, insertionPoint []string, parentTy
 			if err != nil {
 				return nil, nil, err
 			}
+			if !selectionSetHasFieldNamed(selectionSet, "__typename") {
+				selectionSet = append(selectionSet, &ast.Field{Alias: "__typename", Name: "__typename", Definition: &ast.FieldDefinition{Name: "__typename", Type: ast.NamedType("String", nil)}})
+			}
 			inlineFragment := *selection
 			inlineFragment.SelectionSet = selectionSet
 			selectionSetResult = append(selectionSetResult, &inlineFragment)
@@ -190,6 +193,9 @@ func extractSelectionSet(ctx *PlanningContext, insertionPoint []string, parentTy
 			if err != nil {
 				return nil, nil, err
 			}
+			if !selectionSetHasFieldNamed(selectionSet, "__typename") {
+				selectionSet = append(selectionSet, &ast.Field{Alias: "__typename", Name: "__typename", Definition: &ast.FieldDefinition{Name: "__typename", Type: ast.NamedType("String", nil)}})
+			}
 			inlineFragment := ast.InlineFragment{
 				TypeCondition: selection.Definition.TypeCondition,
 				SelectionSet:  selectionSet,

diff --git a/plan_test.go b/plan_test.go
@@ -264,7 +264,7 @@ func TestQueryPlanInlineFragment(t *testing.T) {
 			{
 				"ServiceURL": "A",
 				"ParentType": "Query",
-				"SelectionSet": "{ movies { ... on Movie { id title(language: French) } } }",
+				"SelectionSet": "{ movies { ... on Movie { id title(language: French) __typename } } }",
 				"InsertionPoint": null,
 				"Then": null
 			}
@@ -314,7 +314,7 @@ func TestQueryPlanInlineFragmentPlan(t *testing.T) {
 			{
 				"ServiceURL": "A",
 				"ParentType": "Query",
-				"SelectionSet": "{ movies { _id: id ... on Movie { id title(language: French) } } }",
+				"SelectionSet": "{ movies { _id: id ... on Movie { id title(language: French) __typename } } }",
 				"InsertionPoint": null,
 				"Then": [
 					{
@@ -347,7 +347,7 @@ func TestQueryPlanFragmentSpread1(t *testing.T) {
 			{
 				"ServiceURL": "A",
 				"ParentType": "Query",
-				"SelectionSet": "{ movies { ... on Movie { id title(language: French) } } }",
+				"SelectionSet": "{ movies { ... on Movie { id title(language: French) __typename } } }",
 				"InsertionPoint": null,
 				"Then": null
 			}
@@ -634,13 +634,13 @@ func TestQueryPlanSupportsAliasing(t *testing.T) {
 }
 
 func TestQueryPlanSupportsUnions(t *testing.T) {
-	PlanTestFixture4.Check(t, "{ animals { ... on Dog { name } ... on Cat { name } ... on Snake { name } } }", `
+	PlanTestFixture4.Check(t, "{ animals { ... on Dog { name } ... on Cat { name }  ... on Snake { name } } }", `
     {
       "RootSteps": [
         {
           "ServiceURL": "A",
           "ParentType": "Query",
-          "SelectionSet": "{ animals { ... on Dog { name } ... on Cat { name } ... on Snake { name } __typename } }",
+          "SelectionSet": "{ animals { ... on Dog { name __typename } ... on Cat { name __typename } ... on Snake { name __typename } __typename } }",
           "InsertionPoint": null,
           "Then": null
         }