Merge pull request #584 from 99designs/fix-deprecated-directive

Fix for @deprecated directive not appearing

codegen/data.go

@@ -62,9 +62,16 @@ func BuildData(cfg *config.Config) (*Data, error) {
 		return nil, err
 	}
 
+	dataDirectives := make(map[string]*Directive)
+	for name, d := range b.Directives {
+		if !d.Builtin {
+			dataDirectives[name] = d
+		}
+	}
+
 	s := Data{
 		Config:     cfg,
-		Directives: b.Directives,
+		Directives: dataDirectives,
 		Schema:     b.Schema,
 		SchemaStr:  b.SchemaStr,
 		Interfaces: map[string]*Interface{},

codegen/directive.go

@@ -11,8 +11,9 @@ import (
 )
 
 type Directive struct {
-	Name string
-	Args []*FieldArgument
+	Name    string
+	Args    []*FieldArgument
+	Builtin bool
 }
 
 func (b *builder) buildDirectives() (map[string]*Directive, error) {
@@ -22,8 +23,10 @@ func (b *builder) buildDirectives() (map[string]*Directive, error) {
 		if _, ok := directives[name]; ok {
 			return nil, errors.Errorf("directive with name %s already exists", name)
 		}
+
+		var builtin bool
 		if name == "skip" || name == "include" || name == "deprecated" {
-			continue
+			builtin = true
 		}
 
 		var args []*FieldArgument
@@ -50,8 +53,9 @@ func (b *builder) buildDirectives() (map[string]*Directive, error) {
 		}
 
 		directives[name] = &Directive{
-			Name: name,
-			Args: args,
+			Name:    name,
+			Args:    args,
+			Builtin: builtin,
 		}
 	}
 

codegen/testserver/resolver.go

@@ -110,6 +110,9 @@ func (r *queryResolver) ShapeUnion(ctx context.Context) (ShapeUnion, error) {
 func (r *queryResolver) Autobind(ctx context.Context) (*Autobind, error) {
 	panic("not implemented")
 }
+func (r *queryResolver) DeprecatedField(ctx context.Context) (string, error) {
+	panic("not implemented")
+}
 func (r *queryResolver) Panics(ctx context.Context) (*Panics, error) {
 	panic("not implemented")
 }

codegen/testserver/schema.graphql

@@ -18,6 +18,7 @@ type Query {
     inputSlice(arg: [String!]!): Boolean!
     shapeUnion: ShapeUnion!
     autobind: Autobind
+    deprecatedField: String! @deprecated(reason: "test deprecated directive")
 }
 
 type Subscription {