Merge pull request #255 from 99designs/introspection-fixes

Fix introspection api

example/todo/schema.graphql

@@ -21,13 +21,17 @@ type Todo {
 	done: Boolean!
 }
 
+"Passed to createTodo to create a new todo"
 input TodoInput {
+	"The body text"
 	text: String!
+	"Is it done already?"
 	done: Boolean
 }
 
 scalar Map
 
+"Prevents access to a field if the user doesnt have the matching role"
 directive @hasRole(role: Role!) on FIELD_DEFINITION
 
 enum Role {

example/todo/todo_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/99designs/gqlgen/client"
-	introspection "github.com/99designs/gqlgen/graphql/introspection"
+	"github.com/99designs/gqlgen/graphql/introspection"
 	"github.com/99designs/gqlgen/handler"
 	"github.com/stretchr/testify/require"
 )

graphql/introspection/introspection.go

@@ -30,7 +30,7 @@ type (
 	InputValue struct {
 		Name         string
 		Description  string
-		DefaultValue string
+		DefaultValue *string
 		Type         *Type
 	}
 )

graphql/introspection/schema.go

@@ -1,6 +1,10 @@
 package introspection
 
-import "github.com/vektah/gqlparser/ast"
+import (
+	"strings"
+
+	"github.com/vektah/gqlparser/ast"
+)
 
 type Schema struct {
 	schema *ast.Schema
@@ -9,6 +13,9 @@ type Schema struct {
 func (s *Schema) Types() []Type {
 	var types []Type
 	for _, typ := range s.schema.Types {
+		if strings.HasPrefix(typ.Name, "__") {
+			continue
+		}
 		types = append(types, *WrapTypeFromDef(s.schema, typ))
 	}
 	return types

graphql/introspection/type.go

@@ -69,9 +69,20 @@ func (t *Type) Fields(includeDeprecated bool) []Field {
 			continue
 		}
 
+		var args []InputValue
+		for _, arg := range f.Arguments {
+			args = append(args, InputValue{
+				Type:         WrapTypeFromType(t.schema, arg.Type),
+				Name:         arg.Name,
+				Description:  arg.Description,
+				DefaultValue: defaultValue(f.DefaultValue),
+			})
+		}
+
 		fields = append(fields, Field{
 			Name:              f.Name,
 			Description:       f.Description,
+			Args:              args,
 			Type:              WrapTypeFromType(t.schema, f.Type),
 			IsDeprecated:      isDeprecated(f.Directives),
 			DeprecationReason: deprecationReason(f.Directives),
@@ -88,14 +99,23 @@ func (t *Type) InputFields() []InputValue {
 	var res []InputValue
 	for _, f := range t.def.Fields {
 		res = append(res, InputValue{
-			Name:        f.Name,
-			Description: f.Description,
-			Type:        WrapTypeFromType(t.schema, f.Type),
+			Name:         f.Name,
+			Description:  f.Description,
+			Type:         WrapTypeFromType(t.schema, f.Type),
+			DefaultValue: defaultValue(f.DefaultValue),
 		})
 	}
 	return res
 }
 
+func defaultValue(value *ast.Value) *string {
+	if value == nil {
+		return nil
+	}
+	val := value.String()
+	return &val
+}
+
 func (t *Type) Interfaces() []Type {
 	if t.def == nil || t.def.Kind != ast.Object {
 		return nil