refactor: DirectiveArgs

99designs · Mar 12, 2017 · 93ddece · 93ddece
1 parent 8f5605a
commit 93ddece
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/internal/common/directive.go b/internal/common/directive.go
@@ -4,21 +4,18 @@ import (
 	"github.com/neelance/graphql-go/internal/lexer"
 )
 
-type Directive struct {
-	Name string
-	Args map[string]interface{}
-}
+type DirectiveArgs map[string]interface{}
 
-func ParseDirectives(l *lexer.Lexer) map[string]*Directive {
-	directives := make(map[string]*Directive)
+func ParseDirectives(l *lexer.Lexer) map[string]DirectiveArgs {
+	directives := make(map[string]DirectiveArgs)
 	for l.Peek() == '@' {
 		l.ConsumeToken('@')
 		name := l.ConsumeIdent()
-		var args map[string]interface{}
+		var args DirectiveArgs
 		if l.Peek() == '(' {
 			args = ParseArguments(l)
 		}
-		directives[name] = &Directive{Name: name, Args: args}
+		directives[name] = args
 	}
 	return directives
 }
diff --git a/internal/exec/exec.go b/internal/exec/exec.go
@@ -671,10 +671,10 @@ type typeAssertExec struct {
 	typeExec    iExec
 }
 
-func skipByDirective(r *request, d map[string]*common.Directive) bool {
-	if skip, ok := d["skip"]; ok {
+func skipByDirective(r *request, d map[string]common.DirectiveArgs) bool {
+	if args, ok := d["skip"]; ok {
 		p := valuePacker{valueType: boolType}
-		v, err := p.pack(r, r.resolveVar(skip.Args["if"]))
+		v, err := p.pack(r, r.resolveVar(args["if"]))
 		if err != nil {
 			r.addError(errors.Errorf("%s", err))
 		}
@@ -683,9 +683,9 @@ func skipByDirective(r *request, d map[string]*common.Directive) bool {
 		}
 	}
 
-	if include, ok := d["include"]; ok {
+	if args, ok := d["include"]; ok {
 		p := valuePacker{valueType: boolType}
-		v, err := p.pack(r, r.resolveVar(include.Args["if"]))
+		v, err := p.pack(r, r.resolveVar(args["if"]))
 		if err != nil {
 			r.addError(errors.Errorf("%s", err))
 		}

diff --git a/internal/query/query.go b/internal/query/query.go
@@ -51,18 +51,18 @@ type Field struct {
 	Alias      string
 	Name       string
 	Arguments  map[string]interface{}
-	Directives map[string]*common.Directive
+	Directives map[string]common.DirectiveArgs
 	SelSet     *SelectionSet
 }
 
 type FragmentSpread struct {
 	Name       string
-	Directives map[string]*common.Directive
+	Directives map[string]common.DirectiveArgs
 }
 
 type InlineFragment struct {
 	Fragment
-	Directives map[string]*common.Directive
+	Directives map[string]common.DirectiveArgs
 }
 
 func (Field) isSelection()          {}