type check for scalars

99designs · Oct 22, 2016 · 2b6460a · 2b6460a
1 parent 17034fe
commit 2b6460a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/example/starwars/starwars.go b/example/starwars/starwars.go
@@ -509,7 +509,7 @@ func resolveCharacters(ids []string) *[]characterResolver {
 type reviewResolver struct {
 }
 
-func (r *reviewResolver) Stars() int {
+func (r *reviewResolver) Stars() int32 {
 	panic("TODO")
 }
 
@@ -520,7 +520,7 @@ func (r *reviewResolver) Commentary() *string {
 type friendsConnectionResolver struct {
 }
 
-func (r *friendsConnectionResolver) TotalCount() int {
+func (r *friendsConnectionResolver) TotalCount() int32 {
 	panic("TODO")
 }
 

diff --git a/internal/exec/exec.go b/internal/exec/exec.go
@@ -75,6 +75,14 @@ func makeExec(target *iExec, s *schema.Schema, t schema.Type, resolverType refle
 	return nil
 }
 
+var scalarTypes = map[string]reflect.Type{
+	"Int":     reflect.TypeOf(int32(0)),
+	"Float":   reflect.TypeOf(float64(0)),
+	"String":  reflect.TypeOf(""),
+	"Boolean": reflect.TypeOf(true),
+	"ID":      reflect.TypeOf(""),
+}
+
 func makeExec2(s *schema.Schema, t schema.Type, resolverType reflect.Type, typeRefMap map[typeRefMapKey]*typeRef) (iExec, error) {
 	nonNull := false
 	if nn, ok := t.(*schema.NonNull); ok {
@@ -90,6 +98,13 @@ func makeExec2(s *schema.Schema, t schema.Type, resolverType reflect.Type, typeR
 
 	switch t := t.(type) {
 	case *schema.Scalar:
+		if !nonNull {
+			resolverType = resolverType.Elem()
+		}
+		scalarType := scalarTypes[t.Name]
+		if resolverType != scalarType {
+			return nil, fmt.Errorf("expected %s, got %s", scalarType, resolverType)
+		}
 		return &scalarExec{}, nil
 
 	case *schema.Object: