Merge pull request #637 from 99designs/fix-is-slice

Fix Mapping Custom Scalar to Slice

codegen/config/binder.go

@@ -193,9 +193,9 @@ func (ref *TypeReference) Elem() *TypeReference {
 		}
 	}
 
-	if s, isSlice := ref.GO.(*types.Slice); isSlice {
+	if ref.IsSlice() {
 		return &TypeReference{
-			GO:          s.Elem(),
+			GO:          ref.GO.(*types.Slice).Elem(),
 			GQL:         ref.GQL.Elem,
 			CastType:    ref.CastType,
 			Definition:  ref.Definition,
@@ -221,7 +221,7 @@ func (t *TypeReference) IsNilable() bool {
 
 func (t *TypeReference) IsSlice() bool {
 	_, isSlice := t.GO.(*types.Slice)
-	return isSlice
+	return t.GQL.Elem != nil && isSlice
 }
 
 func (t *TypeReference) IsNamed() bool {

codegen/testserver/bytes.go

@@ -0,0 +1,27 @@
+package testserver
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/99designs/gqlgen/graphql"
+)
+
+func MarshalBytes(b []byte) graphql.Marshaler {
+	return graphql.WriterFunc(func(w io.Writer) {
+		_, _ = fmt.Fprintf(w, "%q", string(b))
+	})
+}
+
+func UnmarshalBytes(v interface{}) ([]byte, error) {
+	switch v := v.(type) {
+	case string:
+		return []byte(v), nil
+	case *string:
+		return []byte(*v), nil
+	case []byte:
+		return v, nil
+	default:
+		return nil, fmt.Errorf("%T is not []byte", v)
+	}
+}

codegen/testserver/gqlgen.yml

@@ -68,3 +68,5 @@ models:
       oldFoo: { fieldName: foo, resolver: true }
   FallbackToStringEncoding:
     model: "github.com/99designs/gqlgen/codegen/testserver.FallbackToStringEncoding"
+  Bytes:
+    model: "github.com/99designs/gqlgen/codegen/testserver.Bytes"

codegen/testserver/resolver.go

@@ -140,6 +140,9 @@ func (r *queryResolver) DefaultScalar(ctx context.Context, arg string) (string,
 func (r *queryResolver) Slices(ctx context.Context) (*Slices, error) {
 	panic("not implemented")
 }
+func (r *queryResolver) ScalarSlice(ctx context.Context) ([]byte, error) {
+	panic("not implemented")
+}
 func (r *queryResolver) Fallback(ctx context.Context, arg FallbackToStringEncoding) (FallbackToStringEncoding, error) {
 	panic("not implemented")
 }

codegen/testserver/slices.graphql

@@ -1,5 +1,6 @@
 extend type Query {
     slices: Slices
+    scalarSlice: Bytes!
 }
 
 type Slices {
@@ -8,3 +9,5 @@ type Slices {
   test3: [String]!
   test4: [String!]!
 }
+
+scalar Bytes

codegen/testserver/slices_test.go

@@ -30,4 +30,16 @@ func TestSlices(t *testing.T) {
 		require.NotNil(t, resp.Slices.Test3)
 		require.NotNil(t, resp.Slices.Test4)
 	})
+
+	t.Run("custom scalars to slices work", func(t *testing.T) {
+		resolvers.QueryResolver.ScalarSlice = func(ctx context.Context) ([]byte, error) {
+			return []byte("testing"), nil
+		}
+
+		var resp struct {
+			ScalarSlice string
+		}
+		c.MustPost(`query { scalarSlice }`, &resp)
+		require.Equal(t, "testing", resp.ScalarSlice)
+	})
 }