Fix/update result (#10)

Co-authored-by: baiyunhui <[email protected]>

Author: kooksee

cmds/protoc-gen-go-enum/internal/gen.go

@@ -0,0 +1,88 @@
+package internal
+
+import (
+	"fmt"
+
+	"github.com/dave/jennifer/jen"
+	"google.golang.org/protobuf/compiler/protogen"
+)
+
+// GenerateFile generates a .errors.pb.go file containing service definitions.
+func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.GeneratedFile {
+	filename := file.GeneratedFilenamePrefix + ".pb.enum.go"
+	genFile := jen.NewFile(string(file.GoPackageName))
+	genFile.HeaderComment("Code generated by protoc-gen-go-sql. DO NOT EDIT.")
+	genFile.HeaderComment("versions:")
+	genFile.HeaderComment(fmt.Sprintf("- protoc-gen-go-enum %s", version))
+	genFile.HeaderComment(fmt.Sprintf("- protoc                 %s", protocVersion(gen)))
+	if file.Proto.GetOptions().GetDeprecated() {
+		genFile.HeaderComment(fmt.Sprintf("%s is a deprecated file.", file.Desc.Path()))
+	} else {
+		genFile.HeaderComment(fmt.Sprintf("source: %s", file.Desc.Path()))
+	}
+
+	genFile.Comment("This is a compile-time assertion to ensure that this generated file")
+	genFile.Comment("is compatible with the grpc package it is being compiled against.")
+	genFile.Comment("Requires gRPC-Go v1.32.0 or later.")
+	genFile.Id("const _ =").Qual("google.golang.org/grpc", "SupportPackageIsVersion7")
+
+	g := gen.NewGeneratedFile(filename, file.GoImportPath)
+	g.Skip()
+
+	var genEnum = func(enum *protogen.Enum) {
+		genFile.
+			Func().Id(enum.GoIdent.GoName + "Values").
+			Params().
+			Index().String().
+			BlockFunc(func(group *jen.Group) {
+				var codes []jen.Code
+				for _, v := range enum.Values {
+					codes = append(codes, jen.Lit(string(v.Desc.Name())))
+				}
+				group.Return(jen.Index().String().Values(codes...))
+			})
+		genFile.Line()
+
+		genFile.
+			Func().
+			Id(enum.GoIdent.GoName + "Decode").
+			Params(jen.Id("name").String()).
+			Id(enum.GoIdent.GoName).
+			BlockFunc(func(group *jen.Group) {
+				var codes []jen.Code
+				for _, v := range enum.Values {
+					codes = append(codes, jen.Lit(string(v.Desc.Name())))
+				}
+				group.Return(jen.Id(enum.GoIdent.GoName).Call(
+					jen.Id(enum.GoIdent.GoName + "_value").Index(jen.Id("name"))))
+			})
+		genFile.Line()
+	}
+
+	for _, enum := range file.Enums {
+		g.Unskip()
+		genEnum(enum)
+	}
+
+	for _, msg := range file.Messages {
+		for _, enum := range msg.Enums {
+			g.Unskip()
+			genEnum(enum)
+		}
+	}
+
+	g.P(genFile.GoString())
+	return g
+}
+
+func protocVersion(gen *protogen.Plugin) string {
+	v := gen.Request.GetCompilerVersion()
+	if v == nil {
+		return "(unknown)"
+	}
+	var suffix string
+	if s := v.GetSuffix(); s != "" {
+		suffix = "-" + s
+	}
+	return fmt.Sprintf("v%d.%d.%d%s", v.GetMajor(), v.GetMinor(), v.GetPatch(), suffix)
+}

cmds/protoc-gen-go-enum/internal/version.go

@@ -0,0 +1,3 @@
+package internal
+
+const version = "v0.0.1"

cmds/protoc-gen-go-enum/main.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"github.com/pubgo/funk/cmds/protoc-gen-go-enum/internal"
+	"google.golang.org/protobuf/compiler/protogen"
+	"google.golang.org/protobuf/types/pluginpb"
+)
+
+func main() {
+	protogen.Options{}.Run(func(gen *protogen.Plugin) error {
+		gen.SupportedFeatures = uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL)
+
+		for _, f := range gen.Files {
+			if !f.Generate {
+				continue
+			}
+
+			internal.GenerateFile(gen, f)
+		}
+		return nil
+	})
+}

cmds/protoc-gen-go-errors/internal/gen.go

@@ -45,14 +45,13 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 		g.Unskip()
 
 		for _, codeName := range m.Values {
-			var name = strings.ToLower(fmt.Sprintf("%s.%s.%s",
+			var name = strings.ToLower(fmt.Sprintf("%s.%s",
 				file.Desc.Package(),
-				"err_code",
 				strcase.ToSnake(string(codeName.Desc.Name())),
 			))
 
 			var statusName = "OK"
-			if tag.DefaultCode != 0 {
+			if tag.DefaultCode != 0 && int32(codeName.Desc.Number()) != 0 {
 				statusName = tag.DefaultCode.String()
 			}
 
@@ -86,7 +85,10 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 					jen.Id("Name"):    jen.Lit(name),
 					jen.Id("BizCode"): jen.Lit(num),
 					jen.Id("Reason"):  jen.Lit(rr),
-				}).Line()
+				})
+			genFile.Var().Id("_").Op("=").
+				Qual("github.com/pubgo/funk/errors", "RegisterErrCodes").
+				Call(jen.Id("ErrCode" + string(codeName.Desc.Name()))).Line()
 		}
 	}
 

cmds/protoc-gen-go-sql/internal/gen.go

@@ -15,7 +15,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 	genFile := jen.NewFile(string(file.GoPackageName))
 	genFile.HeaderComment("Code generated by protoc-gen-go-sql. DO NOT EDIT.")
 	genFile.HeaderComment("versions:")
-	genFile.HeaderComment(fmt.Sprintf("- protoc-gen-lava-errors %s", version))
+	genFile.HeaderComment(fmt.Sprintf("- protoc-gen-go-sql %s", version))
 	genFile.HeaderComment(fmt.Sprintf("- protoc                 %s", protocVersion(gen)))
 	if file.Proto.GetOptions().GetDeprecated() {
 		genFile.HeaderComment(fmt.Sprintf("%s is a deprecated file.", file.Desc.Path()))

errors/aaa.go

@@ -2,13 +2,24 @@ package errors
 
 import (
 	"fmt"
+	"google.golang.org/grpc/status"
 
 	json "github.com/goccy/go-json"
 )
 
 var _ json.Marshaler = (Tags)(nil)
 var _ fmt.Formatter = (Tags)(nil)
 
+type Maps map[string]any
+
+func (t Maps) Tags() Tags {
+	var tags = make(Tags, 0, len(t))
+	for k, v := range t {
+		tags = append(tags, Tag{K: k, V: v})
+	}
+	return tags
+}
+
 type Tags []Tag
 
 func (t Tags) Format(f fmt.State, verb rune) {
@@ -54,15 +65,13 @@ type ErrAs interface {
 	As(any) bool
 }
 
-type Errors interface {
-	Error
-	Errors() []error
-	Append(err ...error) error
-}
-
 type Error interface {
 	Kind() string
 	Error() string
 	String() string
 	MarshalJSON() ([]byte, error)
 }
+
+type GRPCStatus interface {
+	GRPCStatus() *status.Status
+}

errors/err_code.go

@@ -2,16 +2,27 @@ package errors
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 
 	json "github.com/goccy/go-json"
-
 	"github.com/pubgo/funk/errors/internal"
 	"github.com/pubgo/funk/generic"
 	"github.com/pubgo/funk/proto/errorpb"
 	"github.com/pubgo/funk/stack"
 )
 
+func NewCodeErr(code *errorpb.ErrCode) error {
+	if generic.IsNil(code) {
+		return nil
+	}
+
+	return &ErrWrap{
+		caller: stack.Caller(1),
+		err:    &ErrCode{pb: code, err: errors.New(code.Reason)},
+	}
+}
+
 func WrapCode(err error, code *errorpb.ErrCode) error {
 	if generic.IsNil(err) {
 		return nil
@@ -23,7 +34,7 @@ func WrapCode(err error, code *errorpb.ErrCode) error {
 
 	return &ErrWrap{
 		caller: stack.Caller(1),
-		err:    &ErrCode{pb: code, err: err},
+		err:    &ErrCode{pb: code, err: handleGrpcError(err)},
 	}
 }
 

errors/err_code_registry.go

@@ -0,0 +1,25 @@
+package errors
+
+import (
+	"fmt"
+	"github.com/pubgo/funk/proto/errorpb"
+)
+
+var codes = make(map[string]*errorpb.ErrCode)
+
+func GetErrCodes() []*errorpb.ErrCode {
+	var codeList []*errorpb.ErrCode
+	for _, v := range codes {
+		codeList = append(codeList, v)
+	}
+	return codeList
+}
+
+func RegisterErrCodes(code *errorpb.ErrCode) error {
+	if codes[code.Name] != nil {
+		panic(fmt.Sprintf("code exists, code=%s", codes[code.Name]))
+	}
+
+	codes[code.Name] = code
+	return nil
+}

errors/err_msg.go

@@ -2,16 +2,27 @@ package errors
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 
 	json "github.com/goccy/go-json"
-
 	"github.com/pubgo/funk/errors/internal"
 	"github.com/pubgo/funk/generic"
 	"github.com/pubgo/funk/proto/errorpb"
 	"github.com/pubgo/funk/stack"
 )
 
+func NewMsgErr(msg *errorpb.ErrMsg) error {
+	if generic.IsNil(msg) {
+		return nil
+	}
+
+	return &ErrWrap{
+		caller: stack.Caller(1),
+		err:    &ErrMsg{pb: msg, err: errors.New(msg.Msg)},
+	}
+}
+
 func WrapMsg(err error, msg *errorpb.ErrMsg) error {
 	if generic.IsNil(err) {
 		return nil
@@ -23,7 +34,7 @@ func WrapMsg(err error, msg *errorpb.ErrMsg) error {
 
 	return &ErrWrap{
 		caller: stack.Caller(1),
-		err:    &ErrMsg{pb: msg, err: err},
+		err:    &ErrMsg{pb: msg, err: handleGrpcError(err)},
 	}
 }