Fix/241112 (#31)

Author: kooksee

Makefile

@@ -45,3 +45,4 @@ refactor:
 
 install-protoc:
 	go install -v ./cmds/protoc-gen-cloudjobs
+	go install -v ./cmds/protoc-gen-go-errors

assert/must_test.go

@@ -37,15 +37,10 @@ func TestRespTest(t *testing.T) {
 	defer func() {
 		errors.Debug(errors.Parse(recover()))
 	}()
-	testPanic1(t)
+	Must(init1Next())
 }
 
 func TestRespNext(t *testing.T) {
-	testPanic1(t)
-}
-
-func testPanic1(t *testing.T) {
-	// xerrImpl.Must(xerrImpl.New("ok"))
 	Must(init1Next())
 }
 

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

@@ -22,7 +22,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 	genFile.HeaderComment("Code generated by protoc-gen-go-errors. DO NOT EDIT.")
 	genFile.HeaderComment("versions:")
 	genFile.HeaderComment(fmt.Sprintf("- protoc-gen-go-errors %s", version))
-	genFile.HeaderComment(fmt.Sprintf("- protoc                 %s", protocVersion(gen)))
+	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 {
@@ -60,6 +60,9 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 			field, ok := proto.GetExtension(codeName.Desc.Options(), errorpb.E_Field).(*errorpb.Fields)
 			if ok && field != nil {
 				statusName = field.Code.String()
+				if field.Name != "" {
+					name = field.Name
+				}
 			}
 
 			// comment

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

@@ -1,3 +1,3 @@
 package internal
 
-const version = "v0.0.6"
+const version = "v0.0.7"

errors/filter_stack.go

@@ -21,16 +21,16 @@ func RegStackPkgFilter(filter ...interface{}) {
 			continue
 		}
 
-		switch ff.(type) {
+		switch ff := ff.(type) {
 		case reflect.Type:
-			skipStackMap.Store(stack.CallerWithType(ff.(reflect.Type)).Pkg, nil)
+			skipStackMap.Store(stack.CallerWithType(ff).Pkg, nil)
 			continue
 		}
 
 		typ := reflect.TypeOf(ff)
 		switch typ.Kind() {
 		case reflect.String:
-			skipStackMap.Store(ff.(string), nil)
+			skipStackMap.Store(ff, nil)
 		case reflect.Func:
 			skipStackMap.Store(stack.CallerWithFunc(ff).Pkg, nil)
 		default:

errors/z_code_test.go

@@ -25,7 +25,7 @@ func TestCodeErr(t *testing.T) {
 		StatusCode: errorpb.Code_Aborted,
 		Code:       100000,
 		Name:       "hello.test.123",
-		Message:    fmt.Sprintf("test error"),
+		Message:    "test error",
 	})
 
 	err = errors.WrapMapTag(err, errors.Maps{

errors/z_err_code_test.go

@@ -8,11 +8,11 @@ import (
 )
 
 func TestErrCode(t *testing.T) {
-	err1 := errors.Wrap(errors.NewCodeErr(testcodepb.ErrCodeDbConn), "hello")
-	rr := errors.Is(err1, errors.NewCodeErr(testcodepb.ErrCodeDbConn))
+	err1 := errors.Wrap(errors.NewCodeErr(testcodepb.TestErrCodeDbConn), "hello")
+	rr := errors.Is(err1, errors.NewCodeErr(testcodepb.TestErrCodeDbConn))
 	if !rr {
 		t.Fatal("not match")
 	}
 
-	t.Log(errors.As(err1, testcodepb.ErrCodeDbConn))
+	t.Log(errors.As(err1, testcodepb.TestErrCodeDbConn))
 }

errors/z_error_test.go

@@ -20,7 +20,7 @@ func TestFormat(t *testing.T) {
 	err = errors.WrapTag(err, errors.T("event", "test event"), errors.T("test123", 123), errors.T("test", "hello"))
 	err = errors.Wrapf(err, "next error name=%s", "wrapf")
 
-	err = errors.WrapCode(err, testcodepb.ErrCodeNotFound)
+	err = errors.WrapCode(err, testcodepb.TestErrCodeNotFound)
 	err = errors.WrapMsg(err, &errorpb.ErrMsg{
 		Msg: "this is msg",
 	})