use UnmarshalFunc in args directives implement

99designs · Jun 25, 2019 · be890ab · be890ab
1 parent dd162f0
commit be890ab
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 47 deletions.
diff --git a/codegen/directive.go b/codegen/directive.go
@@ -151,18 +151,12 @@ func (d *Directive) CallArgs() string {
 	return strings.Join(args, ", ")
 }
 
-func (d *Directive) ResolveArgs(obj string, next string) string {
-	args := []string{"ctx", obj, next}
+func (d *Directive) ResolveArgs(obj string, next int) string {
+	args := []string{"ctx", obj, fmt.Sprintf("directive%d", next)}
 
 	for _, arg := range d.Args {
-		dArg := "&" + arg.VarName
-		if !arg.TypeReference.IsPtr() {
-			if arg.Value != nil {
-				dArg = templates.Dump(arg.Value)
-			} else {
-				dArg = templates.Dump(arg.Default)
-			}
-		} else if arg.Value == nil && arg.Default == nil {
+		dArg := arg.VarName
+		if arg.Value == nil && arg.Default == nil {
 			dArg = "nil"
 		}
 

diff --git a/codegen/directives.gotpl b/codegen/directives.gotpl
@@ -2,12 +2,19 @@
 	{{- range $i, $directive := .Directives -}}
 		directive{{add $i 1}} := func(ctx context.Context) (interface{}, error) {
 			{{- range $arg := $directive.Args }}
-				{{- if and $arg.TypeReference.IsPtr ( notNil "Value" $arg ) }}
-					{{ $arg.VarName }} := {{ $arg.Value | dump }}
-				{{- end }}
+				{{- if notNil "Value" $arg }}
+						{{ $arg.VarName }}, err := ec.{{ $arg.TypeReference.UnmarshalFunc }}(ctx, {{ $arg.Value | dump }})
+						if err != nil{
+							return nil, err
+						}
+					{{- else if notNil "Default" $arg }}
+						{{ $arg.VarName }}, err := ec.{{ $arg.TypeReference.UnmarshalFunc }}(ctx, {{ $arg.Default | dump }})
+						if err != nil{
+							return nil, err
+						}
+					{{- end }}
 			{{- end }}
-			n := directive{{$i}}
-			return ec.directives.{{$directive.Name|ucFirst}}({{$directive.ResolveArgs "in" "n" }})
+			return ec.directives.{{$directive.Name|ucFirst}}({{$directive.ResolveArgs "in" $i }})
 		}
 	{{- end }}
 {{ end }}

diff --git a/codegen/testserver/directive_test.go b/codegen/testserver/directive_test.go
@@ -44,18 +44,24 @@ func TestDirectives(t *testing.T) {
 			NewExecutableSchema(Config{
 				Resolvers: resolvers,
 				Directives: DirectiveRoot{
-					Length: func(ctx context.Context, obj interface{}, next graphql.Resolver, min int, max *int) (interface{}, error) {
+					Length: func(ctx context.Context, obj interface{}, next graphql.Resolver, min int, max *int, message *string) (interface{}, error) {
+						e := func(msg string) error {
+							if message == nil{
+								return fmt.Errorf(msg)
+							}
+							return fmt.Errorf(*message)
+						}
 						res, err := next(ctx)
 						if err != nil {
 							return nil, err
 						}
 
 						s := res.(string)
 						if len(s) < min {
-							return nil, fmt.Errorf("too short")
+							return nil, e("too short")
 						}
 						if max != nil && len(s) > *max {
-							return nil, fmt.Errorf("too long")
+							return nil, e("too long")
 						}
 						return res, nil
 					},
@@ -119,7 +125,7 @@ func TestDirectives(t *testing.T) {
 
 			err := c.Post(`query { directiveArg(arg: "") }`, &resp)
 
-			require.EqualError(t, err, `[{"message":"too short","path":["directiveArg"]}]`)
+			require.EqualError(t, err, `[{"message":"invalid length","path":["directiveArg"]}]`)
 			require.Nil(t, resp.DirectiveArg)
 		})
 		t.Run("when function errors on nullable arg directives", func(t *testing.T) {
@@ -171,7 +177,7 @@ func TestDirectives(t *testing.T) {
 
 			err := c.Post(`query { directiveInputNullable(arg: {text:"invalid text",inner:{message:"123"}}) }`, &resp)
 
-			require.EqualError(t, err, `[{"message":"too long","path":["directiveInputNullable"]}]`)
+			require.EqualError(t, err, `[{"message":"not valid","path":["directiveInputNullable"]}]`)
 			require.Nil(t, resp.DirectiveInputNullable)
 		})
 		t.Run("when function errors on inner directives", func(t *testing.T) {
@@ -181,7 +187,7 @@ func TestDirectives(t *testing.T) {
 
 			err := c.Post(`query { directiveInputNullable(arg: {text:"2",inner:{message:""}}) }`, &resp)
 
-			require.EqualError(t, err, `[{"message":"too short","path":["directiveInputNullable"]}]`)
+			require.EqualError(t, err, `[{"message":"not valid","path":["directiveInputNullable"]}]`)
 			require.Nil(t, resp.DirectiveInputNullable)
 		})
 		t.Run("when function errors on nullable inner directives", func(t *testing.T) {
@@ -191,7 +197,7 @@ func TestDirectives(t *testing.T) {
 
 			err := c.Post(`query { directiveInputNullable(arg: {text:"success",inner:{message:"1"},innerNullable:{message:""}}) }`, &resp)
 
-			require.EqualError(t, err, `[{"message":"too short","path":["directiveInputNullable"]}]`)
+			require.EqualError(t, err, `[{"message":"not valid","path":["directiveInputNullable"]}]`)
 			require.Nil(t, resp.DirectiveInputNullable)
 		})
 		t.Run("when function success", func(t *testing.T) {

diff --git a/codegen/testserver/generated.go b/codegen/testserver/generated.go
diff --git a/codegen/testserver/schema.graphql b/codegen/testserver/schema.graphql
@@ -78,7 +78,7 @@ input InputDirectives {
     text: String! @length(min: 0, max: 7, message: "not valid")
     inner: InnerDirectives!
     innerNullable: InnerDirectives
-    thirdParty: ThirdParty @length(min: 0, max: 7, message: "not valid")
+    thirdParty: ThirdParty @length(min: 0, max: 7)
 }
 
 input InnerDirectives {
@@ -116,7 +116,7 @@ type EmbeddedPointer {
     Title: String
 }
 
-directive @length(min: Int!, max: Int) on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION
+directive @length(min: Int!, max: Int, message: String) on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION
 directive @range(min: Int = 0, max: Int) on ARGUMENT_DEFINITION
 directive @custom on ARGUMENT_DEFINITION