Skip to content

Commit 5f38024

Browse files
ekoeko
committed
Added support of custom directives
1 parent 21b77bd commit 5f38024

File tree

21 files changed

+79
-25
lines changed

21 files changed

+79
-25
lines changed

‎graphql.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"time"
99

1010
"github.com/graph-gophers/graphql-go/errors"
11-
"github.com/graph-gophers/graphql-go/internal/common"
1211
"github.com/graph-gophers/graphql-go/internal/exec"
1312
"github.com/graph-gophers/graphql-go/internal/exec/resolvable"
1413
"github.com/graph-gophers/graphql-go/internal/exec/selected"
@@ -17,6 +16,7 @@ import (
1716
"github.com/graph-gophers/graphql-go/internal/validation"
1817
"github.com/graph-gophers/graphql-go/introspection"
1918
"github.com/graph-gophers/graphql-go/log"
19+
"github.com/graph-gophers/graphql-go/pkg/common"
2020
"github.com/graph-gophers/graphql-go/trace"
2121
)
2222

‎graphql_test.go

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
gqlerrors "github.com/graph-gophers/graphql-go/errors"
1212
"github.com/graph-gophers/graphql-go/example/starwars"
1313
"github.com/graph-gophers/graphql-go/gqltesting"
14+
"github.com/graph-gophers/graphql-go/pkg/common"
1415
)
1516

1617
type helloWorldResolver1 struct{}
@@ -45,6 +46,19 @@ func (r *helloSnakeResolver2) SayHello(ctx context.Context, args struct{ FullNam
4546
return "Hello " + args.FullName + "!", nil
4647
}
4748

49+
type customDirectiveResolver struct{}
50+
51+
func (r *customDirectiveResolver) MyTestQuery(ctx context.Context, directives common.DirectiveList) string {
52+
customDirective := directives.Get("customDirective")
53+
customAttribute, _ := customDirective.Args.Get("customAttribute")
54+
55+
return fmt.Sprintf(
56+
"Hello custom directive '%s' with attribute value '%s'!",
57+
customDirective.Name.Name,
58+
customAttribute.String(),
59+
)
60+
}
61+
4862
type theNumberResolver struct {
4963
number int32
5064
}
@@ -213,6 +227,38 @@ func TestHelloWorld(t *testing.T) {
213227
})
214228
}
215229

230+
func TestCustomDirective(t *testing.T) {
231+
t.Parallel()
232+
233+
gqltesting.RunTests(t, []*gqltesting.Test{
234+
{
235+
Schema: graphql.MustParseSchema(`
236+
directive @customDirective(
237+
customAttribute: String!
238+
) on FIELD_DEFINITION
239+
240+
schema {
241+
query: Query
242+
}
243+
244+
type Query {
245+
myTestQuery: String! @customDirective(customAttribute: hi)
246+
}
247+
`, &customDirectiveResolver{}),
248+
Query: `
249+
{
250+
myTestQuery
251+
}
252+
`,
253+
ExpectedResult: `
254+
{
255+
"myTestQuery": "Hello custom directive 'customDirective' with attribute value 'hi'!"
256+
}
257+
`,
258+
},
259+
})
260+
}
261+
216262
func TestHelloSnake(t *testing.T) {
217263
t.Parallel()
218264

‎internal/exec/exec.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"time"
1111

1212
"github.com/graph-gophers/graphql-go/errors"
13-
"github.com/graph-gophers/graphql-go/internal/common"
1413
"github.com/graph-gophers/graphql-go/internal/exec/resolvable"
1514
"github.com/graph-gophers/graphql-go/internal/exec/selected"
1615
"github.com/graph-gophers/graphql-go/internal/query"
1716
"github.com/graph-gophers/graphql-go/internal/schema"
1817
"github.com/graph-gophers/graphql-go/log"
18+
"github.com/graph-gophers/graphql-go/pkg/common"
1919
"github.com/graph-gophers/graphql-go/trace"
2020
)
2121

@@ -207,6 +207,9 @@ func execFieldSelection(ctx context.Context, r *Request, s *resolvable.Schema, f
207207
if f.field.ArgsPacker != nil {
208208
in = append(in, f.field.PackedArgs)
209209
}
210+
if f.field.Directives != nil {
211+
in = append(in, reflect.ValueOf(f.field.Directives))
212+
}
210213
callOut := res.Method(f.field.MethodIndex).Call(in)
211214
result = callOut[0]
212215
if f.field.HasError && !callOut[1].IsNil() {

‎internal/exec/packer/packer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strings"
88

99
"github.com/graph-gophers/graphql-go/errors"
10-
"github.com/graph-gophers/graphql-go/internal/common"
1110
"github.com/graph-gophers/graphql-go/internal/schema"
11+
"github.com/graph-gophers/graphql-go/pkg/common"
1212
)
1313

1414
type packer interface {

‎internal/exec/resolvable/meta.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"reflect"
66

7-
"github.com/graph-gophers/graphql-go/internal/common"
87
"github.com/graph-gophers/graphql-go/internal/schema"
98
"github.com/graph-gophers/graphql-go/introspection"
9+
"github.com/graph-gophers/graphql-go/pkg/common"
1010
)
1111

1212
// Meta defines the details of the metadata schema for introspection.

‎internal/exec/resolvable/resolvable.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"reflect"
77
"strings"
88

9-
"github.com/graph-gophers/graphql-go/internal/common"
109
"github.com/graph-gophers/graphql-go/internal/exec/packer"
1110
"github.com/graph-gophers/graphql-go/internal/schema"
11+
"github.com/graph-gophers/graphql-go/pkg/common"
1212
)
1313

1414
type Schema struct {
@@ -327,6 +327,12 @@ func (b *execBuilder) makeFieldExec(typeName string, f *schema.Field, m reflect.
327327
in = in[1:]
328328
}
329329

330+
if len(f.Directives) > 0 {
331+
if len(in) > 0 {
332+
in = in[1:]
333+
}
334+
}
335+
330336
if len(in) > 0 {
331337
return nil, fmt.Errorf("too many parameters")
332338
}

‎internal/exec/selected/selected.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"sync"
77

88
"github.com/graph-gophers/graphql-go/errors"
9-
"github.com/graph-gophers/graphql-go/internal/common"
109
"github.com/graph-gophers/graphql-go/internal/exec/packer"
1110
"github.com/graph-gophers/graphql-go/internal/exec/resolvable"
1211
"github.com/graph-gophers/graphql-go/internal/query"
1312
"github.com/graph-gophers/graphql-go/internal/schema"
1413
"github.com/graph-gophers/graphql-go/introspection"
14+
"github.com/graph-gophers/graphql-go/pkg/common"
1515
)
1616

1717
type Request struct {

‎internal/exec/subscribe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"time"
1010

1111
"github.com/graph-gophers/graphql-go/errors"
12-
"github.com/graph-gophers/graphql-go/internal/common"
1312
"github.com/graph-gophers/graphql-go/internal/exec/resolvable"
1413
"github.com/graph-gophers/graphql-go/internal/exec/selected"
1514
"github.com/graph-gophers/graphql-go/internal/query"
15+
"github.com/graph-gophers/graphql-go/pkg/common"
1616
)
1717

1818
type Response struct {

‎internal/query/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"text/scanner"
66

77
"github.com/graph-gophers/graphql-go/errors"
8-
"github.com/graph-gophers/graphql-go/internal/common"
8+
"github.com/graph-gophers/graphql-go/pkg/common"
99
)
1010

1111
type Document struct {

‎internal/schema/schema.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"text/scanner"
66

77
"github.com/graph-gophers/graphql-go/errors"
8-
"github.com/graph-gophers/graphql-go/internal/common"
8+
"github.com/graph-gophers/graphql-go/pkg/common"
99
)
1010

1111
// Schema represents a GraphQL service's collective type system capabilities.

0 commit comments

Comments
 (0)