Validation: context.getFragmentSpreads now accepts selectionSet rather than fragment AST node

Commit:
688a1ee20db01ca80fdec2189298078380d81ed6 [688a1ee]
Parents:
cf9be87422
Author:
Lee Byron <[email protected]>
Date:
10 May 2016 at 9:54:10 AM SGT

Author: sogko

rules.go

@@ -858,7 +858,7 @@ func NoFragmentCyclesRule(context *ValidationContext) *ValidationRuleInstance {
 		}
 		visitedFrags[fragmentName] = true
 
-		spreadNodes := context.FragmentSpreads(fragment)
+		spreadNodes := context.FragmentSpreads(fragment.SelectionSet)
 		if len(spreadNodes) == 0 {
 			return
 		}

validator.go

@@ -95,7 +95,7 @@ type ValidationContext struct {
 	variableUsages                 map[HasSelectionSet][]*VariableUsage
 	recursiveVariableUsages        map[*ast.OperationDefinition][]*VariableUsage
 	recursivelyReferencedFragments map[*ast.OperationDefinition][]*ast.FragmentDefinition
-	fragmentSpreads                map[HasSelectionSet][]*ast.FragmentSpread
+	fragmentSpreads                map[*ast.SelectionSet][]*ast.FragmentSpread
 }
 
 func NewValidationContext(schema *Schema, astDoc *ast.Document, typeInfo *TypeInfo) *ValidationContext {
@@ -107,7 +107,7 @@ func NewValidationContext(schema *Schema, astDoc *ast.Document, typeInfo *TypeIn
 		variableUsages:                 map[HasSelectionSet][]*VariableUsage{},
 		recursiveVariableUsages:        map[*ast.OperationDefinition][]*VariableUsage{},
 		recursivelyReferencedFragments: map[*ast.OperationDefinition][]*ast.FragmentDefinition{},
-		fragmentSpreads:                map[HasSelectionSet][]*ast.FragmentSpread{},
+		fragmentSpreads:                map[*ast.SelectionSet][]*ast.FragmentSpread{},
 	}
 }
 
@@ -146,13 +146,13 @@ func (ctx *ValidationContext) Fragment(name string) *ast.FragmentDefinition {
 	f, _ := ctx.fragments[name]
 	return f
 }
-func (ctx *ValidationContext) FragmentSpreads(node HasSelectionSet) []*ast.FragmentSpread {
+func (ctx *ValidationContext) FragmentSpreads(node *ast.SelectionSet) []*ast.FragmentSpread {
 	if spreads, ok := ctx.fragmentSpreads[node]; ok && spreads != nil {
 		return spreads
 	}
 
 	spreads := []*ast.FragmentSpread{}
-	setsToVisit := []*ast.SelectionSet{node.GetSelectionSet()}
+	setsToVisit := []*ast.SelectionSet{node}
 
 	for {
 		if len(setsToVisit) == 0 {
@@ -189,14 +189,14 @@ func (ctx *ValidationContext) RecursivelyReferencedFragments(operation *ast.Oper
 
 	fragments := []*ast.FragmentDefinition{}
 	collectedNames := map[string]bool{}
-	nodesToVisit := []HasSelectionSet{operation}
+	nodesToVisit := []*ast.SelectionSet{operation.SelectionSet}
 
 	for {
 		if len(nodesToVisit) == 0 {
 			break
 		}
 
-		var node HasSelectionSet
+		var node *ast.SelectionSet
 
 		node, nodesToVisit = nodesToVisit[len(nodesToVisit)-1], nodesToVisit[:len(nodesToVisit)-1]
 		spreads := ctx.FragmentSpreads(node)
@@ -210,7 +210,7 @@ func (ctx *ValidationContext) RecursivelyReferencedFragments(operation *ast.Oper
 				fragment := ctx.Fragment(fragName)
 				if fragment != nil {
 					fragments = append(fragments, fragment)
-					nodesToVisit = append(nodesToVisit, fragment)
+					nodesToVisit = append(nodesToVisit, fragment.SelectionSet)
 				}
 			}