chore: fix lint errors (#185)

Author: hgiasac

.github/workflows/lint.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Vet
         run: go vet ./...
       - name: Lint
-        uses: golangci/golangci-lint-action@v7
+        uses: golangci/golangci-lint-action@v8
         with:
           version: latest
           only-new-issues: true

.github/workflows/test.yml

@@ -26,17 +26,23 @@ jobs:
           docker compose up -d
       - name: Run Go unit tests for example/subscription
         run: |
-          cd example/subscription
+          rm -rf ./coverage
+          mkdir -p ./coverage/subscription
+          pushd example/subscription
           go get -t -v ./...
-          go test -v -race -timeout 3m ./...
+          popd
+          go test -v -race -timeout 3m -cover ./... -args -test.gocoverdir=$PWD/coverage/subscription ./example/subscription/...
       - name: Run Go unit tests
-        run: go test -v -race -timeout 3m -coverprofile=coverage.out ./...
+        run: |
+          mkdir -p ./coverage/graphql
+          go test -v -race -timeout 3m  -cover ./ ./ident/... ./pkg/... -args -test.gocoverdir=$PWD/coverage/graphql ./...
       - name: Go coverage format
         if: ${{ github.event_name == 'pull_request' && github.repository == 'hasura/go-graphql-client' }}
         run: |
           go get github.com/boumenot/gocover-cobertura
           go install github.com/boumenot/gocover-cobertura
-          gocover-cobertura < coverage.out > coverage.xml
+          go tool covdata textfmt -i=./coverage/subscription,./coverage/graphql -o ./coverage/coverage.out
+          gocover-cobertura < ./coverage/coverage.out > coverage.xml
       - name: Code Coverage Summary Report
         if: ${{ github.event_name == 'pull_request' && github.repository == 'hasura/go-graphql-client' }}
         uses: irongut/[email protected]

.gitignore

@@ -1,4 +1,4 @@
 .idea/
-coverage.out
+coverage/
 go.work
-go.work.sum
+go.work.sum

.golangci.yml

@@ -53,8 +53,8 @@ linters:
         - G306
         - G404
     funlen:
-      lines: 210
-      statements: 120
+      lines: 240
+      statements: 140
     nestif:
       min-complexity: 10
 

pkg/jsonutil/graphql.go

@@ -18,7 +18,7 @@ import (
 //
 // The implementation is created on top of the JSON tokenizer available
 // in "encoding/json".Decoder.
-func UnmarshalGraphQL(data []byte, v interface{}) error {
+func UnmarshalGraphQL(data []byte, v any) error {
 	dec := json.NewDecoder(bytes.NewReader(data))
 	dec.UseNumber()
 
@@ -43,7 +43,7 @@ func UnmarshalGraphQL(data []byte, v interface{}) error {
 type decoder struct {
 	tokenizer interface {
 		Token() (json.Token, error)
-		Decode(v interface{}) error
+		Decode(v any) error
 	}
 
 	// Stack of what part of input JSON we're in the middle of - objects, arrays.
@@ -84,7 +84,7 @@ func (s stack) TopValue() reflect.Value {
 }
 
 // Decode decodes a single JSON value from d.tokenizer into v.
-func (d *decoder) Decode(v interface{}) error {
+func (d *decoder) Decode(v any) error {
 	rv := reflect.ValueOf(v)
 	if rv.Kind() != reflect.Ptr {
 		return fmt.Errorf("cannot decode into non-pointer %T", v)
@@ -102,7 +102,7 @@ func (d *decoder) decode() error {
 	// The loop invariant is that the top of each d.vs stack
 	// is where we try to unmarshal the next JSON value we see.
 	for len(d.vs) > 0 {
-		var tok interface{}
+		var tok any
 		tok, err := d.tokenizer.Token()
 
 		if errors.Is(err, io.EOF) {
@@ -485,6 +485,7 @@ func extractUnionFieldTypeName(tag string) *string {
 			return &typeName
 		}
 	}
+
 	return nil
 }
 
@@ -498,15 +499,15 @@ func (d *decoder) filterUnionFieldsByTypeName(typeName string) {
 	for _, st := range d.vs {
 		if len(st) == 0 {
 			filtered = append(filtered, st)
+
 			continue
 		}
 
 		entry := st[len(st)-1]
-		if entry.typeName == nil {
-			// Not a union field (like the parent struct), keep it
-			filtered = append(filtered, st)
-		} else if *entry.typeName == typeName {
-			// Union field which matches the typename, keep it
+
+		if entry.typeName == nil || *entry.typeName == typeName {
+			// Not a union field (like the parent struct)
+			// or union field which matches the typename, keep it
 			filtered = append(filtered, st)
 		} else {
 			// Union field doesn't match - set it to nil if it's a pointer
@@ -609,7 +610,7 @@ func keyForGraphQLFragment(value string) bool {
 // unmarshalValue unmarshals JSON value into v.
 // v must be addressable and not obtained by the use of unexported
 // struct fields, otherwise unmarshalValue will panic.
-func unmarshalValue(value interface{}, v reflect.Value) error {
+func unmarshalValue(value any, v reflect.Value) error {
 	b, err := json.Marshal(value) // TODO: Short-circuit (if profiling says it's worth it).
 	if err != nil {
 		return err

query.go

@@ -58,8 +58,8 @@ func constructOptions(options []Option) (*constructOptionsOutput, error) {
 }
 
 func constructQuery(
-	v interface{},
-	variables map[string]interface{},
+	v any,
+	variables map[string]any,
 	options ...Option,
 ) (string, *constructOptionsOutput, error) {
 	query, err := query(v)
@@ -96,8 +96,8 @@ func constructQuery(
 
 // ConstructQuery build GraphQL query string from struct and variables.
 func ConstructQuery(
-	v interface{},
-	variables map[string]interface{},
+	v any,
+	variables map[string]any,
 	options ...Option,
 ) (string, error) {
 	query, _, err := constructQuery(v, variables, options...)
@@ -109,8 +109,8 @@ func ConstructQuery(
 }
 
 func constructMutation(
-	v interface{},
-	variables map[string]interface{},
+	v any,
+	variables map[string]any,
 	options ...Option,
 ) (string, *constructOptionsOutput, error) {
 	query, err := query(v)
@@ -147,8 +147,8 @@ func constructMutation(
 
 // ConstructMutation build GraphQL mutation string from struct and variables.
 func ConstructMutation(
-	v interface{},
-	variables map[string]interface{},
+	v any,
+	variables map[string]any,
 	options ...Option,
 ) (string, error) {
 	query, _, err := constructMutation(v, variables, options...)
@@ -161,8 +161,8 @@ func ConstructMutation(
 
 // ConstructSubscription build GraphQL subscription string from struct and variables.
 func ConstructSubscription(
-	v interface{},
-	variables map[string]interface{},
+	v any,
+	variables map[string]any,
 	options ...Option,
 ) (string, string, error) {
 	query, err := query(v)
@@ -200,7 +200,7 @@ func ConstructSubscription(
 // queryArguments constructs a minified arguments string for variables.
 //
 // E.g., map[string]interface{}{"a": int(123), "b": true} -> "$a:Int!$b:Boolean!".
-func queryArguments(variables map[string]interface{}) string {
+func queryArguments(variables map[string]any) 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))
@@ -228,7 +228,7 @@ 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, v interface{}, value bool) {
+func writeArgumentType(w io.Writer, t reflect.Type, v any, value bool) {
 	if t.Implements(graphqlTypeInterface) {
 		var graphqlType GraphQLType
 		var ok bool
@@ -293,7 +293,7 @@ func writeArgumentType(w io.Writer, t reflect.Type, v interface{}, value bool) {
 // a minified query string from the provided struct v.
 //
 // E.g., struct{Foo Int, BarBaz *bool} -> "{foo,barBaz}".
-func query(v interface{}) (string, error) {
+func query(v any) (string, error) {
 	var buf bytes.Buffer
 
 	err := writeQuery(&buf, reflect.TypeOf(v), reflect.ValueOf(v), false)

scalar.go

@@ -47,15 +47,15 @@ func NewBoolean(v Boolean) *Boolean { return &v }
 func NewFloat(v Float) *Float { return &v }
 
 // NewID is a helper to make a new *ID.
-func NewID(v interface{}) *ID {
+func NewID(v any) *ID {
 	rv := ToID(v)
 
 	return &rv
 }
 
 // ToID is a helper for if you need to get the string version of an integer or
 // a string for the id.
-func ToID(v interface{}) ID {
+func ToID(v any) ID {
 	var s string
 	switch reflect.TypeOf(v).Kind() {
 	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,