Unify error package to xerrors

Author: Yamashou

client/client.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
 	"net/http"
 
 	"github.com/Yamashou/gqlgenc/graphqljson"
@@ -43,12 +42,12 @@ func (c *Client) newRequest(ctx context.Context, query string, vars map[string]i
 
 	requestBody, err := json.Marshal(r)
 	if err != nil {
-		return nil, fmt.Errorf("encode: %s", err.Error())
+		return nil, xerrors.Errorf("encode: %w", err)
 	}
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.BaseURL, bytes.NewBuffer(requestBody))
 	if err != nil {
-		return nil, xerrors.Errorf(": %w", err)
+		return nil, xerrors.Errorf("create request struct failed: %w", err)
 	}
 
 	for _, httpRequestOption := range c.HTTPRequestOptions {
@@ -66,18 +65,18 @@ func (c *Client) newRequest(ctx context.Context, query string, vars map[string]i
 func (c *Client) Post(ctx context.Context, query string, respData interface{}, vars map[string]interface{}, httpRequestOptions ...HTTPRequestOption) error {
 	req, err := c.newRequest(ctx, query, vars, httpRequestOptions)
 	if err != nil {
-		return xerrors.Errorf(": %w", err)
+		return xerrors.Errorf("don't create request: %w", err)
 	}
 	req.Header.Add("Content-Type", "application/json")
 
 	resp, err := c.Client.Do(req)
 	if err != nil {
-		return xerrors.Errorf(": %w", err)
+		return xerrors.Errorf("request failed: %w", err)
 	}
 	defer resp.Body.Close()
 
 	if err := graphqljson.Unmarshal(resp.Body, respData); err != nil {
-		return xerrors.Errorf(": %w", err)
+		return xerrors.Errorf("response mapping failed: %w", err)
 	}
 
 	if resp.StatusCode < 200 || 299 < resp.StatusCode {

clientgen/client.go

@@ -27,7 +27,7 @@ func (p *Plugin) Name() string {
 func (p *Plugin) MutateConfig(cfg *config.Config) error {
 	querySources, err := LoadQuerySources(p.queryFilePaths)
 	if err != nil {
-		return xerrors.Errorf(": %w", err)
+		return xerrors.Errorf("load query sources failed: %w", err)
 	}
 
 	// 1. 全体のqueryDocumentを1度にparse
@@ -39,7 +39,7 @@ func (p *Plugin) MutateConfig(cfg *config.Config) error {
 	// 2. OperationごとのqueryDocumentを作成
 	queryDocuments, err := QueryDocumentsByOperations(cfg.Schema, queryDocument.Operations)
 	if err != nil {
-		return xerrors.Errorf(": %w", err)
+		return xerrors.Errorf("parse query document failed: %w", err)
 	}
 
 	// 3. テンプレートと情報ソースを元にコード生成
@@ -48,7 +48,7 @@ func (p *Plugin) MutateConfig(cfg *config.Config) error {
 	fragments := source.fragments()
 	operationResponses := source.operationResponses()
 	if err := RenderTemplate(cfg, fragments, source.operations(queryDocuments), operationResponses, p.Client); err != nil {
-		return xerrors.Errorf(": %w", err)
+		return xerrors.Errorf("template failed: %w", err)
 	}
 
 	return nil

clientgen/source_generator.go

@@ -149,7 +149,6 @@ func (r *SourceGenerator) NewResponseField(selection ast.Selection) *ResponseFie
 		}
 	}
 
-	// ここに来たらバグ
 	panic("unexpected selection type")
 }
 

clientgen/template.go

@@ -3,6 +3,7 @@ package clientgen
 import (
 	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/99designs/gqlgen/codegen/templates"
+	"golang.org/x/xerrors"
 )
 
 func RenderTemplate(cfg *config.Config, fragments []*Fragment, operations []*Operation, operationResponses []*OperationResponse, client config.PackageConfig) error {
@@ -17,7 +18,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",
 	}); err != nil {
-		return err
+		return xerrors.Errorf("%s generating failed: %w", client.Filename, err)
 	}
 
 	return nil

config/config.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	"context"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -26,6 +25,7 @@ type Config struct {
 	Endpoint EndPointConfig       `yaml:"endpoint"`
 	Query    []string             `yaml:"query"`
 
+	// gqlgen config struct
 	GQLConfig *config.Config `yaml:"-"`
 }
 
@@ -111,24 +111,12 @@ func (c *Config) LoadSchema(ctx context.Context) error {
 func LoadRemoteSchema(ctx context.Context, gqlclient *client.Client) (*ast.Schema, error) {
 	var res introspection.IntrospectionQuery
 	if err := gqlclient.Post(ctx, introspection.Introspection, &res, nil); err != nil {
-		fmt.Println(err)
 		return nil, err
 	}
 
-	var doc ast.SchemaDocument
-	typeMap := make(map[string]*introspection.FullType)
-	for _, typ := range res.Schema.Types {
-		typeMap[*typ.Name] = typ
-	}
-	for _, typeVale := range typeMap {
-		doc.Definitions = append(doc.Definitions, introspection.ParseTypeSystemDefinition(typeVale))
-	}
-
-	for _, directiveValue := range res.Schema.Directives {
-		doc.Directives = append(doc.Directives, introspection.ParseDirectiveDefinition(directiveValue))
-	}
+	doc := introspection.ParseIntrospectionQuery(res)
 
-	schema, err := validator.ValidateSchemaDocument(&doc)
+	schema, err := validator.ValidateSchemaDocument(doc)
 	if err != nil {
 		return nil, err
 	}

generator/generater.go

@@ -3,11 +3,12 @@ package generator
 import (
 	"context"
 
+	"golang.org/x/xerrors"
+
 	"github.com/99designs/gqlgen/api"
 	"github.com/99designs/gqlgen/plugin"
 	"github.com/99designs/gqlgen/plugin/modelgen"
 	"github.com/Yamashou/gqlgenc/config"
-	"github.com/pkg/errors"
 )
 
 func Generate(ctx context.Context, cfg *config.Config, option ...api.Option) error {
@@ -20,18 +21,19 @@ func Generate(ctx context.Context, cfg *config.Config, option ...api.Option) err
 	}
 
 	if err := cfg.LoadSchema(ctx); err != nil {
-		return errors.Wrap(err, "failed to load schema")
+		return xerrors.Errorf("failed to load schema: %w", err)
 	}
 
 	if err := cfg.GQLConfig.Init(); err != nil {
-		return errors.Wrap(err, "generating core failed")
+		return xerrors.Errorf("generating core failed: %w", err)
 	}
 
 	for _, p := range plugins {
 		if mut, ok := p.(plugin.ConfigMutator); ok {
 			err := mut.MutateConfig(cfg.GQLConfig)
 			if err != nil {
-				return errors.Wrap(err, p.Name())
+				// return errors.Wrap(err, p.Name())
+				return xerrors.Errorf("%s failed: %w", p.Name(), err)
 			}
 		}
 	}

introspection/parse.go

@@ -6,7 +6,22 @@ import (
 	"github.com/vektah/gqlparser/v2/ast"
 )
 
-func ParseDirectiveDefinition(directiveValue *DirectiveType) *ast.DirectiveDefinition {
+func ParseIntrospectionQuery(query IntrospectionQuery) *ast.SchemaDocument {
+	var doc ast.SchemaDocument
+	typeMap := query.Schema.Types.NameMap()
+
+	for _, typeVale := range typeMap {
+		doc.Definitions = append(doc.Definitions, parseTypeSystemDefinition(typeVale))
+	}
+
+	for _, directiveValue := range query.Schema.Directives {
+		doc.Directives = append(doc.Directives, parseDirectiveDefinition(directiveValue))
+	}
+
+	return &doc
+}
+
+func parseDirectiveDefinition(directiveValue *DirectiveType) *ast.DirectiveDefinition {
 	args := make(ast.ArgumentDefinitionList, 0, len(directiveValue.Args))
 	for _, arg := range directiveValue.Args {
 		argumentDefinition := buildInputValue(arg)
@@ -172,7 +187,7 @@ func parseScalarTypeExtension(typeVale *FullType) *ast.Definition {
 	}
 }
 
-func ParseTypeSystemDefinition(typeVale *FullType) *ast.Definition {
+func parseTypeSystemDefinition(typeVale *FullType) *ast.Definition {
 	switch typeVale.Kind {
 	case TypeKindScalar:
 		return parseScalarTypeExtension(typeVale)

introspection/type.go

@@ -13,6 +13,17 @@ const (
 	TypeKindNonNull     TypeKind = "NON_NULL"
 )
 
+type FullTypes []*FullType
+
+func (fs FullTypes) NameMap() map[string]*FullType {
+	typeMap := make(map[string]*FullType)
+	for _, typ := range fs {
+		typeMap[*typ.Name] = typ
+	}
+
+	return typeMap
+}
+
 type FullType struct {
 	Kind        TypeKind
 	Name        *string
@@ -56,7 +67,7 @@ type IntrospectionQuery struct {
 		QueryType        struct{ Name *string }
 		MutationType     *struct{ Name *string }
 		SubscriptionType *struct{ Name *string }
-		Types            []*FullType
+		Types            FullTypes
 		Directives       []*DirectiveType
 	} `graphql:"__schema"`
 }