Merge pull request #257 from Yamashou/any

interface{} to any and update dependencies
Yamashou · Dec 20, 2024 · 10e03ee · 10e03ee
2 parents 27dbd21 + 7d02fed
commit 10e03ee
Show file tree

Hide file tree

Showing 22 changed files with 325 additions and 327 deletions.
diff --git a/clientgenv2/template.go b/clientgenv2/template.go
@@ -23,7 +23,7 @@ func RenderTemplate(cfg *config.Config, fragments []*Fragment, operations []*Ope
 		PackageName: client.Package,
 		Filename:    client.Filename,
 		Template:    template,
-		Data: map[string]interface{}{
+		Data: map[string]any{
 			"Fragment":            fragments,
 			"Operation":           operations,
 			"OperationResponse":   operationResponses,
@@ -33,7 +33,7 @@ func RenderTemplate(cfg *config.Config, fragments []*Fragment, operations []*Ope
 		},
 		Packages:   cfg.Packages,
 		PackageDoc: "// Code generated by github.com/Yamashou/gqlgenc, DO NOT EDIT.\n",
-		Funcs: map[string]interface{}{
+		Funcs: map[string]any{
 			"genGetters": genGettersGenerator.GenFunc(),
 		},
 	}); err != nil {
@@ -70,7 +70,7 @@ func (g *GenGettersGenerator) returnTypeName(t types.Type, nested bool) string {
 
 		return "*" + name
 	case *types.Interface:
-		return "interface{}"
+		return "any"
 	case *types.Map:
 		return "map[" + g.returnTypeName(it.Key(), true) + "]" + g.returnTypeName(it.Elem(), true)
 	default:

diff --git a/clientgenv2/template_test.go b/clientgenv2/template_test.go
@@ -41,7 +41,7 @@ func TestReturnTypeName(t *testing.T) {
 			name:     "Interface",
 			input:    types.NewInterfaceType(nil, nil).Complete(),
 			nested:   false,
-			expected: "interface{}",
+			expected: "any",
 		},
 		{
 			name:     "Map",

diff --git a/clientv2/client_test.go b/clientv2/client_test.go
@@ -661,7 +661,7 @@ func TestMarshalJSON(t *testing.T) {
 		{
 			name: "marshal NumberOne",
 			args: args{
-				v: map[string]interface{}{"input": NumberOne},
+				v: map[string]any{"input": NumberOne},
 			},
 			want: []byte(`{"input":"ONE"}`),
 		},
@@ -898,7 +898,7 @@ func TestUnsafeChainInterceptor(t *testing.T) {
 
 	t.Run("should properly propagate errors", func(t *testing.T) {
 		expectedError := errors.New("test error")
-		
+
 		// Interceptor that returns an error
 		errorInterceptor := func(ctx context.Context, req *http.Request, gqlInfo *GQLRequestInfo, res any, next RequestInterceptorFunc) error {
 			return expectedError
@@ -925,7 +925,7 @@ func TestUnsafeChainInterceptor(t *testing.T) {
 
 	t.Run("should execute interceptors in correct order", func(t *testing.T) {
 		var order []int
-		
+
 		// Create interceptors that record execution order
 		makeInterceptor := func(id int) RequestInterceptor {
 			return func(ctx context.Context, req *http.Request, gqlInfo *GQLRequestInfo, res any, next RequestInterceptorFunc) error {

diff --git a/config/config.go b/config/config.go
@@ -265,7 +265,7 @@ func (c *Config) LoadSchema(ctx context.Context) error {
 }
 
 func (c *Config) loadRemoteSchema(ctx context.Context) (*ast.Schema, error) {
-	addHeaderInterceptor := func(ctx context.Context, req *http.Request, gqlInfo *clientv2.GQLRequestInfo, res interface{}, next clientv2.RequestInterceptorFunc) error {
+	addHeaderInterceptor := func(ctx context.Context, req *http.Request, gqlInfo *clientv2.GQLRequestInfo, res any, next clientv2.RequestInterceptorFunc) error {
 		for key, value := range c.Endpoint.Headers {
 			req.Header.Set(key, value)
 		}

diff --git a/config/config_test.go b/config/config_test.go
@@ -135,7 +135,7 @@ type mockRemoteServer struct {
 	body []byte
 }
 
-func newMockRemoteServer(t *testing.T, response interface{}) (mock *mockRemoteServer, closeServer func()) {
+func newMockRemoteServer(t *testing.T, response any) (mock *mockRemoteServer, closeServer func()) {
 	t.Helper()
 
 	mock = &mockRemoteServer{

diff --git a/example/annictV2/gen/client.go b/example/annictV2/gen/client.go
diff --git a/example/annictV2/gen/models_gen.go b/example/annictV2/gen/models_gen.go
diff --git a/example/annictV2/main.go b/example/annictV2/main.go
@@ -14,7 +14,7 @@ func main() {
 	key := os.Getenv("ANNICT_KEY")
 
 	annictClient := NewAnnictClient(clientv2.NewClient(http.DefaultClient, "https://api.annict.com/graphql", nil,
-		func(ctx context.Context, req *http.Request, gqlInfo *clientv2.GQLRequestInfo, res interface{}, next clientv2.RequestInterceptorFunc) error {
+		func(ctx context.Context, req *http.Request, gqlInfo *clientv2.GQLRequestInfo, res any, next clientv2.RequestInterceptorFunc) error {
 			req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", key))
 
 			return next(ctx, req, gqlInfo, res)

diff --git a/example/autobind/gen/client.go b/example/autobind/gen/client.go
diff --git a/example/autobind/main.go b/example/autobind/main.go
@@ -17,7 +17,7 @@ func main() {
 
 	githubClient := &gen.Client{
 		Client: clientv2.NewClient(http.DefaultClient, "https://api.github.com/graphql", nil,
-			func(ctx context.Context, req *http.Request, gqlInfo *clientv2.GQLRequestInfo, res interface{}, next clientv2.RequestInterceptorFunc) error {
+			func(ctx context.Context, req *http.Request, gqlInfo *clientv2.GQLRequestInfo, res any, next clientv2.RequestInterceptorFunc) error {
 				req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
 
 				return next(ctx, req, gqlInfo, res)