fix fragments

Author: gbaptista

build_tree.go

@@ -1,6 +1,7 @@
 package fields
 
 import (
+	"sort"
 	"strings"
 )
 
@@ -53,11 +54,11 @@ func BuildTree(request string) map[string][]string {
 
 			path := strings.Join(currentTree, ".")
 
-			tree[path] = append(tree[path], field)
+			tree[path] = appendIfMissing(tree[path], field)
 		}
 
 		if levelUpRegex.MatchString(line) {
-			currentTree = append(currentTree, lastField)
+			currentTree = appendIfMissing(currentTree, lastField)
 			currentLevel++
 		} else if levelDownRegex.MatchString(line) {
 			currentTree = currentTree[:len(currentTree)-1]
@@ -106,12 +107,40 @@ func extractAndGroupFragments(request string) map[string]string {
 	return fragments
 }
 
+const fragmentsLimit int = 1000
+
 func applyFragments(request string, fragments map[string]string) string {
+	var sortedFragments []string
+
+	for name, _ := range fragments {
+		sortedFragments = append(sortedFragments, name)
+	}
+
+	sort.Sort(byLength(sortedFragments))
+
+	continueApplying := true
+
+	replacedFragments := 0
+
+	for continueApplying {
+		if partialFragmentRegex.MatchString(request) {
+			for _, name := range sortedFragments {
+				request = strings.Replace(request, name, fragments[name], -1)
+			}
+
+			replacedFragments++
+
+			if replacedFragments > fragmentsLimit {
+				continueApplying = false
+			}
+		} else {
+			continueApplying = false
+		}
+	}
+
 	// TODO: while ... exists, with a max of loops.
 	for i := 5; i > 0; i-- {
-		for name, body := range fragments {
-			request = strings.Replace(request, name, body, -1)
-		}
+
 	}
 
 	return request
@@ -125,3 +154,12 @@ func removeQuery(request string) string {
 	request = queryStartRegex.ReplaceAllString(request, "")
 	return queryEndRegex.ReplaceAllString(request, "")
 }
+
+func appendIfMissing(tree []string, fieldToAppend string) []string {
+	for _, field := range tree {
+		if field == fieldToAppend {
+			return tree
+		}
+	}
+	return append(tree, fieldToAppend)
+}

field.go

@@ -44,7 +44,7 @@ func nameFromResolver(resolver interface{}) string {
 		fieldType, _ := reflect.TypeOf(
 			resolver).Elem().FieldByName("Field")
 
-		fieldName = fieldType.Tag.Get("name")
+		fieldName = fieldType.Tag.Get("graphql")
 	}
 
 	return fieldName

field_test.go

@@ -6,19 +6,19 @@ import (
 )
 
 type ResolverA struct {
-	Field Field `name:"a"`
+	Field Field `graphql:"a"`
 }
 
 type ResolverB struct {
-	Field Field `name:"b"`
+	Field Field `graphql:"b"`
 }
 
 type ResolverC struct {
-	Field Field `name:"c"`
+	Field Field `graphql:"c"`
 }
 
 type ResolverD struct {
-	Field Field `name:"d"`
+	Field Field `graphql:"d"`
 }
 
 func TestField(t *testing.T) {

regex.go

@@ -12,7 +12,8 @@ const (
 	aliasRegexString  = `.*?:`
 	spacesRegexString = `\s{1,}`
 
-	fragmentsRegexString = `(?m)fragment(.|\n)*?}`
+	fragmentsRegexString       = `(?m)fragment(.|\n)*?}`
+	partialFragmentRegexString = `\.\.\.`
 
 	fragmentNameStartRegexString = `(?m)fragment(\s|\n){1,}`
 	fragmentNameEndRegexString   = `(?m)\s{1,}on(.|\n)*`
@@ -34,7 +35,8 @@ var (
 	aliasRegex  = regexp.MustCompile(aliasRegexString)
 	spacesRegex = regexp.MustCompile(spacesRegexString)
 
-	fragmentsRegex = regexp.MustCompile(fragmentsRegexString)
+	fragmentsRegex       = regexp.MustCompile(fragmentsRegexString)
+	partialFragmentRegex = regexp.MustCompile(partialFragmentRegexString)
 
 	fragmentNameStartRegex = regexp.MustCompile(fragmentNameStartRegexString)
 	fragmentNameEndRegex   = regexp.MustCompile(fragmentNameEndRegexString)

requested_fields_test.go

@@ -20,15 +20,15 @@ query {
 `
 
 type QueryResolver struct {
-	Field Field `name:"query"`
+	Field Field `graphql:"query"`
 }
 
 type SearchResolver struct {
-	Field Field `name:"search"`
+	Field Field `graphql:"search"`
 }
 
 type ProductsResolver struct {
-	Field Field `name:"products"`
+	Field Field `graphql:"products"`
 }
 
 func TestRequestedFieldsForProducts(t *testing.T) {
@@ -69,7 +69,7 @@ var graphql_query_user string = `
 `
 
 type UserResolver struct {
-	Field Field `name:"user"`
+	Field Field `graphql:"user"`
 }
 
 func TestRequestedFieldsForUser(t *testing.T) {

sort_by_length.go

@@ -0,0 +1,13 @@
+package fields
+
+type byLength []string
+
+func (s byLength) Len() int {
+	return len(s)
+}
+func (s byLength) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+func (s byLength) Less(i, j int) bool {
+	return len(s[i]) > len(s[j])
+}