Accept kitchen-sink.graphql again (type conditions on inline fragment…

…s are optional)
graphql · Jan 4, 2016 · 8feed9c · 8feed9c
1 parent f9a84e5
commit 8feed9c
Show file tree

Hide file tree

Showing 5 changed files with 248 additions and 232 deletions.
diff --git a/JsonVisitor.cpp b/JsonVisitor.cpp
@@ -259,10 +259,12 @@ void JsonVisitor::endVisitInlineFragment(const InlineFragment &inlineFragment) {
 
   const auto &children = printed_.back();
 
-  out_ << "\"typeCondition\":" << children[0];
+  auto nextChild = children.begin();
+  if (inlineFragment.getTypeCondition() != nullptr) {
+    out_ << "\"typeCondition\":" << *nextChild++;
+  }
 
   out_ << ",\"directives\":";
-  auto nextChild = children.begin() + 1;
   const auto *directives = inlineFragment.getDirectives();
   if (directives != nullptr) {
     printChildArray(nextChild, directives->size());

diff --git a/ast/ast.ast b/ast/ast.ast
@@ -51,7 +51,7 @@ S Name name
 P? Directive directives
 
 T InlineFragment
-S NamedType typeCondition
+S? NamedType typeCondition
 P? Directive directives
 S SelectionSet selectionSet