made a few changes and added Point type

Author: machship-mm

example/graphqldev/main.go

@@ -59,7 +59,7 @@ func run() error {
 	*/
 	var q struct {
 		Hero struct {
-			ID   graphql.GqlID
+			ID   graphql.GqlString
 			Name graphql.GqlString
 		}
 		Character struct {

example/subscription/main.go

@@ -50,7 +50,7 @@ func run() error {
 	*/
 	var sub struct {
 		User struct {
-			ID   graphql.GqlID
+			ID   graphql.GqlString
 			Name graphql.GqlString
 		} `graphql:"users(limit: $limit, order_by: { id: desc })"`
 	}

example/test/main.go

@@ -14,7 +14,6 @@ func main() {
 
 	var query struct {
 		QueryUser []struct {
-			ID       graphql.GqlID
 			Username graphql.GqlString
 			Name     graphql.GqlString
 			Note     graphql.GqlString
@@ -33,7 +32,7 @@ func main() {
 			UserShared: UserShared{
 				Username: graphql.NewStringStruct("abc"),
 				Name:     graphql.NewStringStruct("ABC"),
-				Note:     graphql.NewStringStruct("note ABC"),
+				// Note:     graphql.NewStringStruct("note ABC"),
 			},
 			Password: graphql.NewStringStruct("password1"),
 		},
@@ -46,14 +45,42 @@ func main() {
 		},
 	}
 
+	// var mutation struct {
+	// 	AddUser struct {
+	// 		User []User
+	// 	} `graphql:"addUser(input: $input)"`
+	// }
+
+	// vars := map[string]interface{}{
+	// 	"input": input,
+	// }
+
+	// err = client.Mutate(context.Background(), &mutation, vars)
+	// if err != nil {
+	// 	// Handle error.
+	// 	log.Fatalln(err)
+	// }
+
+	// fmt.Printf("%+v\n", mutation.AddUser)
+
+	saveTest(client, AddUserInputContainer{input})
+}
+
+type InterfaceTest interface {
+	GetList() interface{}
+}
+
+func saveTest(client *graphql.Client, input InterfaceTest) {
+	var err error
+
 	var mutation struct {
 		AddUser struct {
 			User []User
 		} `graphql:"addUser(input: $input)"`
 	}
 
 	vars := map[string]interface{}{
-		"input": input,
+		"input": input.GetList(),
 	}
 
 	err = client.Mutate(context.Background(), &mutation, vars)
@@ -70,8 +97,16 @@ type AddUserInput struct {
 	Password graphql.GqlString `json:"password,omitempty"`
 }
 
+type AddUserInputContainer struct {
+	List interface{}
+}
+
+func (aui AddUserInputContainer) GetList() interface{} {
+	return aui.List
+}
+
 type User struct {
-	ID graphql.GqlID
+	ID *graphql.GqlString
 	UserShared
 }
 

graphql_test.go

@@ -43,10 +43,10 @@ func TestClient_Query_partialDataWithErrorResponse(t *testing.T) {
 
 	var q struct {
 		Node1 *struct {
-			ID *graphql.GqlID
+			ID *graphql.GqlString
 		} `graphql:"node1: node(id: \"MDEyOklzc3VlQ29tbWVudDE2OTQwNzk0Ng==\")"`
 		Node2 *struct {
-			ID *graphql.GqlID
+			ID *graphql.GqlString
 		} `graphql:"node2: node(id: \"NotExist\")"`
 	}
 
@@ -63,7 +63,7 @@ func TestClient_Query_partialDataWithErrorResponse(t *testing.T) {
 		t.Errorf("got error: %v, want: %v", got, want)
 	}
 
-	if q.Node1 == nil || q.Node1.ID != graphql.NewID("MDEyOklzc3VlQ29tbWVudDE2OTQwNzk0Ng==") {
+	if q.Node1 == nil || q.Node1.ID != graphql.NewString("MDEyOklzc3VlQ29tbWVudDE2OTQwNzk0Ng==") {
 		t.Errorf("got wrong q.Node1: %v", q.Node1)
 	}
 	if q.Node2 != nil {

query.go

@@ -3,6 +3,7 @@ package graphql
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"reflect"
 	"sort"
@@ -13,7 +14,7 @@ import (
 func constructQuery(v interface{}, variables map[string]interface{}, name string) string {
 	query := query(v)
 	if len(variables) > 0 {
-		return "query " + name + "(" + queryArguments(variables) + ")" + query
+		return "query " + name + "(" + queryArguments(variables, false) + ")" + query
 	}
 
 	if name != "" {
@@ -25,7 +26,7 @@ func constructQuery(v interface{}, variables map[string]interface{}, name string
 func constructMutation(v interface{}, variables map[string]interface{}, name string) string {
 	query := query(v)
 	if len(variables) > 0 {
-		return "mutation " + name + "(" + queryArguments(variables) + ")" + query
+		return "mutation " + name + "(" + queryArguments(variables, true) + ")" + query
 	}
 	if name != "" {
 		return "mutation " + name + query
@@ -36,7 +37,7 @@ func constructMutation(v interface{}, variables map[string]interface{}, name str
 func constructSubscription(v interface{}, variables map[string]interface{}, name string) string {
 	query := query(v)
 	if len(variables) > 0 {
-		return "subscription " + name + "(" + queryArguments(variables) + ")" + query
+		return "subscription " + name + "(" + queryArguments(variables, false) + ")" + query
 	}
 	if name != "" {
 		return "subscription " + name + query
@@ -47,7 +48,7 @@ func constructSubscription(v interface{}, variables map[string]interface{}, name
 // queryArguments constructs a minified arguments string for variables.
 //
 // E.g., map[string]interface{}{"a": Int(123), "b": NewBoolean(true)} -> "$a:Int!$b:Boolean".
-func queryArguments(variables map[string]interface{}) string {
+func queryArguments(variables map[string]interface{}, isMutation bool) string {
 	// Sort keys in order to produce deterministic output for testing purposes.
 	// TODO: If tests can be made to work with non-deterministic output, then no need to sort.
 	keys := make([]string, 0, len(variables))
@@ -61,7 +62,7 @@ func queryArguments(variables map[string]interface{}) string {
 		io.WriteString(&buf, "$")
 		io.WriteString(&buf, k)
 		io.WriteString(&buf, ":")
-		writeArgumentType(&buf, reflect.TypeOf(variables[k]), true)
+		writeArgumentType(&buf, reflect.TypeOf(variables[k]), true, isMutation)
 		// Don't insert a comma here.
 		// Commas in GraphQL are insignificant, and we want minified output.
 		// See https://facebook.github.io/graphql/October2016/#sec-Insignificant-Commas.
@@ -72,18 +73,21 @@ func queryArguments(variables map[string]interface{}) string {
 // writeArgumentType writes a minified GraphQL type for t to w.
 // value indicates whether t is a value (required) type or pointer (optional) type.
 // If value is true, then "!" is written at the end of t.
-func writeArgumentType(w io.Writer, t reflect.Type, value bool) {
-	if t.Kind() == reflect.Ptr {
+func writeArgumentType(w io.Writer, t reflect.Type, value, isMutation bool) {
+	if t.Kind() == reflect.Ptr && !isMutation {
 		// Pointer is an optional type, so no "!" at the end of the pointer's underlying type.
-		writeArgumentType(w, t.Elem(), false)
+		writeArgumentType(w, t.Elem(), false, isMutation)
+		return
+	} else if t.Kind() == reflect.Ptr {
+		writeArgumentType(w, t.Elem(), true, isMutation)
 		return
 	}
 
 	switch t.Kind() {
 	case reflect.Slice, reflect.Array:
 		// List. E.g., "[Int]".
 		io.WriteString(w, "[")
-		writeArgumentType(w, t.Elem(), true)
+		writeArgumentType(w, t.Elem(), true, isMutation)
 		io.WriteString(w, "]")
 	default:
 		// Named type. E.g., "Int".
@@ -117,16 +121,19 @@ func writeArgumentType(w io.Writer, t reflect.Type, value bool) {
 // E.g., struct{Foo Int, BarBaz *Boolean} -> "{foo,barBaz}".
 func query(v interface{}) string {
 	var buf bytes.Buffer
-	writeQuery(&buf, reflect.TypeOf(v), false)
+	seen := make(map[string]struct{})
+	writeQuery(&buf, reflect.TypeOf(v), false, "")
+	fmt.Println(seen)
 	return buf.String()
 }
 
 // writeQuery writes a minified query for t to w.
 // If inline is true, the struct fields of t are inlined into parent struct.
-func writeQuery(w io.Writer, t reflect.Type, inline bool) {
+// Seen is used to stop infinite loops
+func writeQuery(w io.Writer, t reflect.Type, inline bool, inverseName string) {
 	switch t.Kind() {
 	case reflect.Ptr, reflect.Slice:
-		writeQuery(w, t.Elem(), false)
+		writeQuery(w, t.Elem(), false, inverseName)
 	case reflect.Struct:
 		// If the type implements json.Unmarshaler, it's a scalar. Don't expand it.
 		if reflect.PtrTo(t).Implements(jsonUnmarshaler) {
@@ -136,20 +143,29 @@ func writeQuery(w io.Writer, t reflect.Type, inline bool) {
 			io.WriteString(w, "{")
 		}
 		for i := 0; i < t.NumField(); i++ {
+			f := t.Field(i)
+			value, ok := f.Tag.Lookup("graphql")
+			if value == "-" {
+				//skip (this is 'omit')
+				continue
+			} else if value == "" {
+				value = ident.ParseMixedCaps(f.Name).ToLowerCamelCase()
+			}
+			if inverseName == value {
+				continue //Don't allow recursion
+			}
+			thisInverseName, _ := f.Tag.Lookup("hasInverse")
+			// if thisInverseName != "" {
+			// 	fmt.Println()
+			// }
 			if i != 0 {
 				io.WriteString(w, ",")
 			}
-			f := t.Field(i)
-			value, ok := f.Tag.Lookup("graphql")
 			inlineField := f.Anonymous && !ok
 			if !inlineField {
-				if ok {
-					io.WriteString(w, value)
-				} else {
-					io.WriteString(w, ident.ParseMixedCaps(f.Name).ToLowerCamelCase())
-				}
+				io.WriteString(w, value)
 			}
-			writeQuery(w, f.Type, inlineField)
+			writeQuery(w, f.Type, inlineField, thisInverseName)
 		}
 		if !inline {
 			io.WriteString(w, "}")

query_test.go

@@ -18,7 +18,7 @@ func TestConstructQuery(t *testing.T) {
 				Viewer struct {
 					Login      GqlString
 					CreatedAt  GqlTime
-					ID         GqlID
+					ID         GqlString
 					DatabaseID GqlInt64
 				}
 				RateLimit struct {
@@ -259,7 +259,7 @@ func TestConstructMutation(t *testing.T) {
 			}{},
 			inVariables: map[string]interface{}{
 				"input": AddReactionInput{
-					SubjectID: NewID("MDU6SXNzdWUyMzE1MjcyNzk="),
+					SubjectID: NewString("MDU6SXNzdWUyMzE1MjcyNzk="),
 					Content:   ReactionContentThumbsUp,
 				},
 			},
@@ -286,7 +286,7 @@ func TestConstructSubscription(t *testing.T) {
 				Viewer struct {
 					Login      GqlString
 					CreatedAt  GqlTime
-					ID         GqlID
+					ID         GqlString
 					DatabaseID GqlInt64
 				}
 				RateLimit struct {
@@ -542,16 +542,16 @@ func TestQueryArguments(t *testing.T) {
 			want: "$id:ID!",
 		},
 		{
-			in:   map[string]interface{}{"ids": []*GqlID{NewID("someID"), NewID("anotherID")}},
+			in:   map[string]interface{}{"ids": []*GqlString{NewString("someID"), NewString("anotherID")}},
 			want: `$ids:[ID!]!`,
 		},
 		{
-			in:   map[string]interface{}{"ids": &[]*GqlID{NewID("someID"), NewID("anotherID")}},
+			in:   map[string]interface{}{"ids": &[]*GqlString{NewString("someID"), NewString("anotherID")}},
 			want: `$ids:[ID!]`,
 		},
 	}
 	for i, tc := range tests {
-		got := queryArguments(tc.in)
+		got := queryArguments(tc.in, false) //todo:mm: not sure if I should have made this false
 		if got != tc.want {
 			t.Errorf("test case %d:\n got: %q\nwant: %q", i, got, tc.want)
 		}
@@ -594,7 +594,7 @@ const (
 // AddReactionInput is an autogenerated input type of AddReaction.
 type AddReactionInput struct {
 	// The Node ID of the subject to modify. (Required.)
-	SubjectID *GqlID `json:"subjectId"`
+	SubjectID *GqlString `json:"subjectId"`
 	// The name of the emoji to react with. (Required.)
 	Content ReactionContent `json:"content"`
 

scalar.go

@@ -9,33 +9,6 @@ type Query struct {
 	Data interface{} `graphql:"data"`
 }
 
-type GqlID struct {
-	ID string `json:"id,omitempty"`
-}
-
-func NewIDStruct(x string) GqlID {
-	nw := NewID(x)
-	return *nw
-}
-
-func NewID(x string) *GqlID { return &GqlID{x} }
-
-func (id *GqlID) MarshalJSON() ([]byte, error) {
-	return json.Marshal(id.ID)
-}
-
-func (id *GqlID) UnmarshalJSON(data []byte) error {
-	var s *string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return err
-	}
-	if s != nil {
-		id.ID = *s
-	}
-
-	return nil
-}
-
 type GqlBool struct {
 	Bool  bool
 	Valid bool // Valid is true if Bool is not NULL
@@ -200,3 +173,19 @@ func (nt *GqlTime) UnmarshalJSON(data []byte) error {
 	}
 	return nil
 }
+
+type GqlPoint struct {
+	//this does not need an ID as it is a scalar type in GraphQL
+
+	Latitude  *GqlFloat64 `json:"latitude,omitempty"`
+	Longitude *GqlFloat64 `json:"longitude,omitempty"`
+}
+
+func NewPointStruct(lat, lng float64) GqlPoint {
+	nw := NewPoint(lat, lng)
+	return *nw
+}
+
+func NewPoint(lat, lng float64) *GqlPoint {
+	return &GqlPoint{Latitude: NewFloat64(lat), Longitude: NewFloat64(lng)}
+}