Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
name: Go
on:
push:
branches: [ master ]
branches: [main]
pull_request:
branches: [ master ]
branches: [main]

permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- run: go mod download
- uses: golangci/golangci-lint-action@v8
with:
version: latest
- run: go build -v .
- run: make test
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
with:
go-version-file: go.mod
- uses: golangci/golangci-lint-action@82606bf257cbaff209d206a39f5134f0cfbfd2ee # v9.2.1
with:
version: v2.12.2
- run: make build
- run: make test
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ fmt:
lint:
golangci-lint cache clean && golangci-lint run

build:
go build -v ./...

test:
go test -v ./...
go test -race -v ./...

compat:
go tool gorelease
70 changes: 35 additions & 35 deletions clientgenv2/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func RenderTemplate(cfg *config.Config, fragments []*Fragment, operations []*Ope
Packages: cfg.Packages,
PackageDoc: "// Code generated by github.com/gqlgo/gqlgenc, DO NOT EDIT.\n",
Funcs: map[string]any{
"genGetters": genGettersGenerator.GenFunc(),
"genGetters": genGettersGenerator.GenFunc(),
"genConversionGetters": genGettersGenerator.ConversionGettersFunc(fragments),
},
})
Expand Down Expand Up @@ -85,39 +85,6 @@ func (g *GenGettersGenerator) GenFunc() func(name string, p types.Type) string {
}
}

func (g *GenGettersGenerator) returnTypeName(t types.Type, nested bool) string {
switch it := t.(type) {
case *types.Basic:
return it.String()
case *types.Pointer:
return "*" + g.returnTypeName(it.Elem(), true)
case *types.Slice:
return "[]" + g.returnTypeName(it.Elem(), true)
case *types.Named:
s := strings.Split(it.String(), ".")
name := s[len(s)-1]

isImported := it.Obj().Parent() != nil && it.Obj().Pkg().Name() != g.ClientPackageName
if isImported {
name = namedTypeString(it)
}

if nested {
return name
}

return "*" + name
case *types.Interface:
return "any"
case *types.Map:
return "map[" + g.returnTypeName(it.Key(), true) + "]" + g.returnTypeName(it.Elem(), true)
case *types.Alias:
return g.returnTypeName(it.Underlying(), nested)
default:
return fmt.Sprintf("%T----", it)
}
}

// ConversionGettersFunc returns a template function that generates conversion getters
// for spread fragments. Each getter constructs the original fragment type from the
// flattened parent struct's fields.
Expand Down Expand Up @@ -165,7 +132,7 @@ func resolveTargetFragment(fragmentMap map[string]*Fragment, spread *SpreadFragm

// writeConversionGetter writes a single conversion getter method that constructs
// the target fragment type from the owner struct's fields.
func (g *GenGettersGenerator) writeConversionGetter(buf *bytes.Buffer, ownerName string, targetTypeName string, targetStruct *types.Struct) {
func (g *GenGettersGenerator) writeConversionGetter(buf *bytes.Buffer, ownerName, targetTypeName string, targetStruct *types.Struct) {
buf.WriteString("func (t *" + ownerName + ") Get" + targetTypeName + "() *" + targetTypeName + " {\n")
buf.WriteString("if t == nil {\n t = &" + ownerName + "{}\n}\n")
buf.WriteString("return &" + targetTypeName + "{\n")
Expand Down Expand Up @@ -197,6 +164,39 @@ func (g *GenGettersGenerator) writeFieldAssignment(buf *bytes.Buffer, field *typ
}
}

func (g *GenGettersGenerator) returnTypeName(t types.Type, nested bool) string {
switch it := t.(type) {
case *types.Basic:
return it.String()
case *types.Pointer:
return "*" + g.returnTypeName(it.Elem(), true)
case *types.Slice:
return "[]" + g.returnTypeName(it.Elem(), true)
case *types.Named:
s := strings.Split(it.String(), ".")
name := s[len(s)-1]

isImported := it.Obj().Parent() != nil && it.Obj().Pkg().Name() != g.ClientPackageName
if isImported {
name = namedTypeString(it)
}

if nested {
return name
}

return "*" + name
case *types.Interface:
return "any"
case *types.Map:
return "map[" + g.returnTypeName(it.Key(), true) + "]" + g.returnTypeName(it.Elem(), true)
case *types.Alias:
return g.returnTypeName(it.Underlying(), nested)
default:
return fmt.Sprintf("%T----", it)
}
}

// typeName extracts the short type name from a types.Type.
func (g *GenGettersGenerator) typeName(t types.Type) string {
switch it := t.(type) {
Expand Down
4 changes: 2 additions & 2 deletions clientv2/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ func (e *Encoder) Encode(v reflect.Value) ([]byte, error) {
t := v.Type()

switch t.Kind() {
case reflect.Ptr:
case reflect.Pointer:
return e.encodePtr(v)
case reflect.Struct:
return e.encodeStruct(v)
Expand Down Expand Up @@ -863,7 +863,7 @@ func (e *Encoder) prepareFields(t reflect.Type) []fieldInfo {

func isNil(v reflect.Value) bool {
switch v.Kind() {
case reflect.Ptr, reflect.Map, reflect.Slice, reflect.Chan, reflect.Func, reflect.Interface:
case reflect.Pointer, reflect.Map, reflect.Slice, reflect.Chan, reflect.Func, reflect.Interface:
return v.IsNil()
default:
return false
Expand Down
7 changes: 3 additions & 4 deletions example/autobind/gen/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion example/autobind/model/models_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions example/enum-directive/gen/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions example/files-info/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ const FilesDir = "./example/files-info/files/"

const imageFile = "mario-strikers_1600w_original.jpg"

func newof[T any](val T) *T {
return &val
}

func getFiles(files ...string) ([]*graphql.Upload, error) {
result := make([]*graphql.Upload, len(files))

Expand All @@ -31,7 +27,7 @@ func getFiles(files ...string) ([]*graphql.Upload, error) {
return result, err
}

result[i] = newof(uFile)
result[i] = &uFile
}

return result, nil
Expand Down
3 changes: 1 addition & 2 deletions example/input-scalar/gen/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions example/no-autobind/gen/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions generator/testdata/nullable_input_omittable/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"testing"

"github.com/99designs/gqlgen/graphql"

"github.com/gqlgo/gqlgenc/clientv2"
generated "github.com/gqlgo/gqlgenc/generator/testdata/nullable_input_omittable/expected"
)
Expand Down
22 changes: 12 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
module github.com/gqlgo/gqlgenc

go 1.26.2
go 1.26

toolchain go1.26.4

require (
github.com/99designs/gqlgen v0.17.73
github.com/goccy/go-yaml v1.17.1
github.com/99designs/gqlgen v0.17.91
github.com/goccy/go-yaml v1.19.2
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
github.com/stretchr/testify v1.10.0
github.com/vektah/gqlparser/v2 v2.5.26
golang.org/x/text v0.24.0
golang.org/x/tools v0.42.0
github.com/stretchr/testify v1.11.1
github.com/vektah/gqlparser/v2 v2.5.34
golang.org/x/text v0.38.0
golang.org/x/tools v0.46.0
)

require (
Expand All @@ -22,16 +24,16 @@ require (
github.com/kr/pretty v0.3.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.14.1 // indirect
github.com/sosodev/duration v1.3.1 // indirect
github.com/sosodev/duration v1.4.0 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.24.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
golang.org/x/mod v0.33.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/mod v0.37.0 // indirect
golang.org/x/sync v0.21.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
Loading