use arg value for the ResolveArgs

99designs · Dec 4, 2018 · d586bb6 · d586bb6
1 parent e201bcb
commit d586bb6
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 21 deletions.
diff --git a/codegen/templates/args.gotpl b/codegen/templates/args.gotpl
@@ -10,11 +10,8 @@
 						{{- range $dArg := $directive.Args }}
 							{{- if $dArg.IsPtr }}
 								{{- $argValue := $dArg.Value | dump -}}
-								{{- $argDefault := $dArg.Default | dump -}}
 								{{- if not (eq $argValue "nil") }}
 									{{ $dArg.GoVarName }} := {{ $argValue }}
-								{{- else if not (eq $argDefault "nil") }}
-									{{ $dArg.GoVarName }} := {{ $argDefault }}
 								{{- end }}
 							{{- end }}
 						{{- end }}

diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/input.gotpl b/codegen/templates/input.gotpl
@@ -37,11 +37,8 @@
 					{{- range $arg := $directive.Args }}
 						{{- if $arg.IsPtr }}
 							{{- $argValue := $arg.Value | dump -}}
-							{{- $argDefault := $arg.Default | dump -}}
 							{{- if not (eq $argValue "nil") }}
 								{{ $arg.GoVarName }} := {{ $argValue }}
-							{{ else if not (eq $argDefault "nil") }}
-								{{$arg.GoVarName}} := {{ $argDefault }}
 							{{ end -}}
 						{{- end }}
 					{{- end }}
@@ -72,11 +69,8 @@
 						{{- range $arg := $directive.Args }}
 							{{- if $arg.IsPtr }}
 								{{- $argValue := $arg.Value | dump -}}
-								{{- $argDefault := $arg.Default | dump -}}
 								{{- if not (eq $argValue "nil") }}
 									{{ $arg.GoVarName }} := {{ $argValue }}
-								{{ else if not (eq $argDefault "nil") }}
-									{{ $arg.GoVarName }} := {{ $argDefault }}
 								{{ end -}}
 							{{- end }}
 						{{- end }}

diff --git a/codegen/testserver/generated.go b/codegen/testserver/generated.go
diff --git a/codegen/testserver/generated_test.go b/codegen/testserver/generated_test.go
@@ -885,7 +885,7 @@ func (r *testQueryResolver) DirectiveArg(ctx context.Context, arg string) (*stri
 	return &s, nil
 }
 
-func (r *testQueryResolver) DirectiveNullableArg(ctx context.Context, arg *int) (*string, error) {
+func (r *testQueryResolver) DirectiveNullableArg(ctx context.Context, arg *int, arg2 *int) (*string, error) {
 	s := "Ok"
 	return &s, nil
 }

diff --git a/codegen/testserver/resolver.go b/codegen/testserver/resolver.go
@@ -81,7 +81,7 @@ func (r *queryResolver) NullableArg(ctx context.Context, arg *int) (*string, err
 func (r *queryResolver) DirectiveArg(ctx context.Context, arg string) (*string, error) {
 	panic("not implemented")
 }
-func (r *queryResolver) DirectiveNullableArg(ctx context.Context, arg *int) (*string, error) {
+func (r *queryResolver) DirectiveNullableArg(ctx context.Context, arg *int, arg2 *int) (*string, error) {
 	panic("not implemented")
 }
 func (r *queryResolver) DirectiveInputNullable(ctx context.Context, arg *InputDirectives) (*string, error) {

diff --git a/codegen/testserver/schema.graphql b/codegen/testserver/schema.graphql
@@ -13,7 +13,7 @@ type Query {
     user(id: Int!): User!
     nullableArg(arg: Int = 123): String
     directiveArg(arg: String! @length(min:1, max: 255, message: "invalid length")): String
-    directiveNullableArg(arg: Int @range(min:0)): String
+    directiveNullableArg(arg: Int @range(min:0), arg2: Int @range): String
     directiveInputNullable(arg: InputDirectives): String
     directiveInput(arg: InputDirectives!): String
 }
@@ -166,4 +166,4 @@ type EmbeddedPointer {
 }
 
 directive @length(min: Int!, max: Int, message: String!) on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION
-directive @range(min: Int, max: Int, message: String) on ARGUMENT_DEFINITION
+directive @range(min: Int = 0, max: Int, message: String) on ARGUMENT_DEFINITION