GravatarCommit: 3f1f9f5759704ca9ed153c98558236a66af75153 [3f1f9f5]

Parents: 529257b8d3
Author: Lee Byron <[email protected]>
Date: 2 October 2015 at 9:10:21 AM SGT

[RFC] Type condition optional on inline fragments.

Implements graphql/graphql-spec#100

Author: sogko

executor.go

@@ -390,7 +390,11 @@ func doesFragmentConditionMatch(eCtx *ExecutionContext, fragment ast.Node, ttype
 
 	switch fragment := fragment.(type) {
 	case *ast.FragmentDefinition:
-		conditionalType, err := typeFromAST(eCtx.Schema, fragment.TypeCondition)
+		typeConditionAST := fragment.TypeCondition
+		if typeConditionAST == nil {
+			return true
+		}
+		conditionalType, err := typeFromAST(eCtx.Schema, typeConditionAST)
 		if err != nil {
 			return false
 		}
@@ -400,19 +404,24 @@ func doesFragmentConditionMatch(eCtx *ExecutionContext, fragment ast.Node, ttype
 		if conditionalType.Name() == ttype.Name() {
 			return true
 		}
-
 		if conditionalType, ok := conditionalType.(Abstract); ok {
 			return conditionalType.IsPossibleType(ttype)
 		}
 	case *ast.InlineFragment:
-		conditionalType, err := typeFromAST(eCtx.Schema, fragment.TypeCondition)
+		typeConditionAST := fragment.TypeCondition
+		if typeConditionAST == nil {
+			return true
+		}
+		conditionalType, err := typeFromAST(eCtx.Schema, typeConditionAST)
 		if err != nil {
 			return false
 		}
 		if conditionalType == ttype {
 			return true
 		}
-
+		if conditionalType.Name() == ttype.Name() {
+			return true
+		}
 		if conditionalType, ok := conditionalType.(Abstract); ok {
 			return conditionalType.IsPossibleType(ttype)
 		}

kitchen-sink.graphql

@@ -12,6 +12,12 @@ query namedQuery($foo: ComplexFooType, $bar: Bar = DefaultBarValue) {
         }
       }
     }
+    ... @skip(unless: $foo) {
+      id
+    }
+    ... {
+      id
+    }
   }
 }