add ArgumentAny and refactor

Author: CreatCodeBuild

argument.go

@@ -13,6 +13,21 @@ type Argument struct {
 	Value string
 }
 
+func ArgumentAny(name string, value interface{}) (Argument, error) {
+	switch v := value.(type) {
+	case bool:
+		return ArgumentBool(name, v), nil
+	case int:
+		return ArgumentInt(name, v), nil
+	case string:
+		return ArgumentString(name, v), nil
+	case []string:
+		return ArgumentStringSlice(name, v...), nil
+	default:
+		return Argument{}, ArgumentTypeNotSupportErr{Value: value}
+	}
+}
+
 func ArgumentBool(name string, value bool) Argument {
 	return Argument{name, fmt.Sprintf("%v", value)}
 }

argument_test.go

@@ -32,4 +32,4 @@ func TestArgumentStringSlice(t *testing.T) {
 
 	a = ArgumentStringSlice("blocked")
 	assert.Equal(t, Argument{"blocked", "[]"}, a)
-}
+}

error.go

@@ -1,6 +1,8 @@
 package graphb
 
-import "fmt"
+import (
+	"fmt"
+)
 
 type nameType string
 
@@ -46,3 +48,12 @@ type CyclicFieldErr struct {
 func (e CyclicFieldErr) Error() string {
 	return fmt.Sprintf("Field %+v contains cyclic loop", e.Field)
 }
+
+// ArgumentTypeNotSupportErr is returned when user tries to pass an unsupported type to ArgumentAny.
+type ArgumentTypeNotSupportErr struct {
+	Value interface{}
+}
+
+func (e ArgumentTypeNotSupportErr) Error() string {
+	return fmt.Sprintf("Argument %+v of Type %T is not supported", e.Value, e.Value)
+}

example/example_test.go

@@ -26,7 +26,7 @@ func TestMethodChaining(t *testing.T) {
 				SetAlias("some_alias"),
 		).
 		AddFields(graphb.MakeField("b"))
-	s, err := q.JSONBody()
+	s, err := q.JSON()
 	assert.Nil(t, err)
 	assert.Equal(t, `{"query":"query{some_alias:a(string:\"123\"){x(string:\"123\",string_slice:[\"a\"]),y,},b,}"}`, s)
 }

field.go

@@ -143,6 +143,11 @@ func (f *Field) SetArguments(arguments ...Argument) *Field {
 	return f
 }
 
+func (f *Field) AddArguments(argument ...Argument) *Field {
+	f.Arguments = append(f.Arguments, argument...)
+	return f
+}
+
 // SetFields sets the sub fields of a Field and return the pointer to this Field.
 func (f *Field) SetFields(fs ...*Field) *Field {
 	f.Fields = fs

graphb_test.go

@@ -29,7 +29,7 @@ func TestTheWholePackage(t *testing.T) {
 		assert.Nil(t, err)
 		assert.Equal(t, `query{Alias:courses(uid:123,blocked_nds:["nd013","nd014"]){key,id,},}`, str)
 
-		str, err = q.JSONBody()
+		str, err = q.JSON()
 		assert.Nil(t, err)
 		assert.Equal(t, `{"query":"query{Alias:courses(uid:123,blocked_nds:[\"nd013\",\"nd014\"]){key,id,},}"}`, str)
 
@@ -123,7 +123,7 @@ func TestTheWholePackage(t *testing.T) {
 			),
 		)
 		assert.Nil(t, err)
-		s, err := q.JSONBody()
+		s, err := q.JSON()
 		assert.Nil(t, err)
 		assert.Equal(t, `{"query":"query another_test{users{id,username,threads(title:\"A Good Title\"){title,created_at,},},}"}`, s)
 	})
@@ -136,7 +136,7 @@ func TestTheWholePackage(t *testing.T) {
 		assert.Equal(t, "", s)
 		assert.False(t, ok)
 
-		s, err = q.JSONBody()
+		s, err = q.JSON()
 		assert.Equal(t, "'muTatio' is an invalid operation type in GraphQL. A valid type is one of 'query', 'mutation', 'subscription'", err.Error())
 		assert.Equal(t, "", s)
 	})
@@ -176,7 +176,7 @@ func TestMethodChaining(t *testing.T) {
 				SetAlias("some_alias"),
 		).
 		AddFields(MakeField("x"))
-	s, err := q.JSONBody()
+	s, err := q.JSON()
 	assert.Nil(t, err)
 	assert.Equal(t, `{"query":"query{some_alias:x(string:\"123\"){x(string:\"123\",string_slice:[\"a\"]),x,},x,}"}`, s)
 }

query.go

@@ -102,8 +102,8 @@ func MakeQuery(Type operationType) *Query {
 	return &Query{Type: Type}
 }
 
-// JSONBody returns a json string with "query" field.
-func (q *Query) JSONBody() (string, error) {
+// JSON returns a json string with "query" field.
+func (q *Query) JSON() (string, error) {
 	strCh, err := q.StringChan()
 	if err != nil {
 		return "", errors.WithStack(err)
@@ -118,6 +118,16 @@ func (q *Query) SetName(name string) *Query {
 	return q
 }
 
+// GetField return the field identified by the name. Nil if not exist.
+func (q *Query) GetField(name string) *Field {
+	for _, f := range q.Fields {
+		if f.Name == name {
+			return f
+		}
+	}
+	return nil
+}
+
 // SetFields sets the Fields field of this Query.
 // If q.Fields already contains data, they will be replaced.
 func (q *Query) SetFields(fields ...*Field) *Query {