Merge pull request #33 from vektah/unset-arguments

Allow unset arguments

example/starwars/starwars_test.go

@@ -148,6 +148,29 @@ func TestStarwars(t *testing.T) {
 		require.Equal(t, "Leia Organa", resp.Droid.FriendsConnection.Edges[2].Node.Name)
 	})
 
+	t.Run("unset optional arguments", func(t *testing.T) {
+		var resp struct {
+			Hero struct {
+				FriendsConnection struct {
+					Friends []struct {
+						Name string
+					}
+				}
+			}
+		}
+		query := `
+			query a($first:Int, $after:ID) {
+				hero {
+					friendsConnection(first:$first, after:$after) {
+						friends { name }
+					}
+				}
+			}`
+		c.MustPost(query, &resp)
+
+		require.Len(t, resp.Hero.FriendsConnection.Friends, 3)
+	})
+
 	t.Run("mutations must be run in sequence", func(t *testing.T) {
 		var resp struct {
 			A struct{ Time string }

graphql/exec.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/vektah/gqlgen/neelance/common"
 	"github.com/vektah/gqlgen/neelance/query"
 	"github.com/vektah/gqlgen/neelance/schema"
 )
@@ -34,7 +35,13 @@ func collectFields(doc *query.Document, selSet []query.Selection, satisfies []st
 				if len(sel.Arguments) > 0 {
 					f.Args = map[string]interface{}{}
 					for _, arg := range sel.Arguments {
-						f.Args[arg.Name.Name] = arg.Value.Value(variables)
+						if variable, ok := arg.Value.(*common.Variable); ok {
+							if val, ok := variables[variable.Name]; ok {
+								f.Args[arg.Name.Name] = val
+							}
+						} else {
+							f.Args[arg.Name.Name] = arg.Value.Value(variables)
+						}
 					}
 				}
 				return f