fix #2524 basic alias Byte was not binded properly

99designs · Jan 26, 2023 · 8fa26b4 · 8fa26b4
1 parent e6114a2
commit 8fa26b4
Show file tree

Hide file tree

Showing 8 changed files with 287 additions and 2 deletions.
diff --git a/_examples/scalars/.gqlgen.yml b/_examples/scalars/.gqlgen.yml
@@ -18,3 +18,7 @@ models:
     model: github.com/99designs/gqlgen/_examples/scalars/model.Banned
   DarkMode:
     model: github.com/99designs/gqlgen/_examples/scalars/model.Preferences
+  Bytes:
+    model: "github.com/99designs/gqlgen/codegen/testserver/singlefile.Bytes"
+  Runes:
+    model: "github.com/99designs/gqlgen/_examples/scalars/model.Runes"
diff --git a/_examples/scalars/external/model.go b/_examples/scalars/external/model.go
@@ -3,7 +3,7 @@ package external
 type (
 	ObjectID     int
 	Manufacturer string // remote named string
-	Count        uint32 // remote named uint32
+	Count        uint8  // remote named uint8
 )
 
 const (

diff --git a/_examples/scalars/generated.go b/_examples/scalars/generated.go
diff --git a/_examples/scalars/model/model.go b/_examples/scalars/model/model.go
@@ -56,6 +56,9 @@ type User struct {
 	Children        uint
 	Cars            external.Count
 	Weddings        Sum
+	SomeBytes       []byte
+	SomeOtherBytes  []byte
+	SomeRunes       []rune
 }
 
 // Point is serialized as a simple array, eg [1, 2]
@@ -204,3 +207,22 @@ func UnmarshalPreferences(v interface{}) (*Prefs, error) {
 	}
 	return &Prefs{DarkMode: tmp}, nil
 }
+
+func MarshalRunes(r []rune) graphql.Marshaler {
+	return graphql.WriterFunc(func(w io.Writer) {
+		_, _ = fmt.Fprintf(w, "%q", string(r))
+	})
+}
+
+func UnmarshalRunes(v interface{}) ([]rune, error) {
+	switch v := v.(type) {
+	case string:
+		return []rune(v), nil
+	case *string:
+		return []rune(*v), nil
+	case []rune:
+		return v, nil
+	default:
+		return nil, fmt.Errorf("%T is not []rune", v)
+	}
+}
diff --git a/_examples/scalars/resolvers.go b/_examples/scalars/resolvers.go
@@ -40,6 +40,9 @@ func (r *queryResolver) User(ctx context.Context, id external.ObjectID) (*model.
 		Children:        3,
 		Cars:            5,
 		Weddings:        2,
+		SomeBytes:       []byte("abcdef"),
+		SomeOtherBytes:  []byte{97, 98, 99, 100, 101, 102},
+		SomeRunes:       []rune{'H', 'e', 'l', 'l', 'o', ' ', '世', '界'},
 	}, nil
 }
 

diff --git a/_examples/scalars/scalar_test.go b/_examples/scalars/scalar_test.go
@@ -25,6 +25,9 @@ type RawUser struct {
 	Children          int
 	Cars              int
 	Weddings          int
+	SomeBytes         string
+	SomeOtherBytes    string
+	SomeRunes         string
 }
 
 func TestScalars(t *testing.T) {
@@ -90,6 +93,16 @@ func TestScalars(t *testing.T) {
 		require.Equal(t, 2, resp.User.Weddings)
 	})
 
+	t.Run("basic alias byte and rune", func(t *testing.T) {
+		var resp struct{ User RawUser }
+
+		err := c.Post(`{ user(id:"=1=") { someBytes someOtherBytes someRunes } }`, &resp)
+		require.NoError(t, err)
+		require.Equal(t, "abcdef", resp.User.SomeBytes)
+		require.Equal(t, "abcdef", resp.User.SomeOtherBytes)
+		require.Equal(t, "Hello 世界", resp.User.SomeRunes)
+	})
+
 	t.Run("custom error messages", func(t *testing.T) {
 		var resp struct{ Search []RawUser }