chore: quick update fix/version at 2025-09-16 22:00:15

Author: kooksee

component/cloudevent/publisher.go

@@ -133,7 +133,7 @@ func (c *Client) publish(ctx context.Context, topic string, args proto.Message,
 		Log(func(e *zerolog.Event) {
 			e.Str(logfields.Msg, "failed to marshal args to any proto")
 		}).
-		Unwrap(&gErr)
+		UnwrapErr(&gErr)
 	if gErr != nil {
 		return
 	}
@@ -143,7 +143,7 @@ func (c *Client) publish(ctx context.Context, topic string, args proto.Message,
 		Log(func(e *zerolog.Event) {
 			e.Str(logfields.Msg, "failed to marshal any proto to bytes")
 		}).
-		Unwrap(&gErr)
+		UnwrapErr(&gErr)
 	if gErr != nil {
 		return
 	}
@@ -167,7 +167,7 @@ func (c *Client) publish(ctx context.Context, topic string, args proto.Message,
 		Log(func(e *zerolog.Event) {
 			e.Str(logfields.Msg, fmt.Sprintf("failed to publish msg to stream, topic=%s msg_id=%s", topic, msgId))
 		}).
-		Unwrap(&gErr)
+		UnwrapErr(&gErr)
 	if gErr != nil {
 		return
 	}

env/env.go

@@ -120,7 +120,7 @@ func Key(key string) string {
 
 func LoadFiles(files ...string) (r result.Error) {
 	files = lo.Filter(files, func(item string, index int) bool { return pathutil.IsExist(item) })
-	if result.CatchErr(&r, godotenv.Load(files...)) {
+	if result.Catch(&r, godotenv.Load(files...)) {
 		return
 	}
 

v2/result/api.go

@@ -106,27 +106,25 @@ func WrapFn[T any](fn func() (T, error)) Result[T] {
 	return Result[T]{err: err}
 }
 
-func CatchErr(setter ErrSetter, err error, contexts ...context.Context) bool {
+func Catch(setter ErrSetter, err error, contexts ...context.Context) bool {
 	return catchErr(newError(err), setter, nil, contexts...)
 }
 
-func Catch(rawSetter *error, err error, contexts ...context.Context) bool {
+func CatchErr(rawSetter *error, err error, contexts ...context.Context) bool {
 	return catchErr(newError(err), nil, rawSetter, contexts...)
 }
 
 func MapTo[T, U any](r Result[T], fn func(T) U) Result[U] {
 	if r.IsErr() {
-		err := errors.WrapCaller(r.getErr(), 1)
-		return Fail[U](err)
+		return Fail[U](errors.WrapCaller(r.getErr(), 1))
 	}
 
 	return OK(fn(r.getValue()))
 }
 
 func FlatMapTo[T, U any](r Result[T], fn func(T) Result[U]) Result[U] {
 	if r.IsErr() {
-		err := errors.WrapCaller(r.getErr(), 1)
-		return Fail[U](err)
+		return Fail[U](errors.WrapCaller(r.getErr(), 1))
 	}
 
 	return fn(r.getValue())

v2/result/error.go

@@ -71,16 +71,11 @@ func (e Error) Inspect(fn func(error)) Error {
 
 func (e Error) InspectErr(fn func(error)) Error { return e.Inspect(fn) }
 
-func (e Error) Unwrap() error { return e.err }
-func (e Error) UnwrapErr(setter ErrSetter, contexts ...context.Context) bool {
-	return catchErr(e, setter, nil, contexts...)
-}
-
-func (e Error) Catch(setter *error, ctx ...context.Context) bool {
+func (e Error) CatchErr(setter *error, ctx ...context.Context) bool {
 	return catchErr(e, nil, setter, ctx...)
 }
 
-func (e Error) CatchErr(setter ErrSetter, ctx ...context.Context) bool {
+func (e Error) Catch(setter ErrSetter, ctx ...context.Context) bool {
 	return catchErr(e, setter, nil, ctx...)
 }
 

v2/result/interface.go

@@ -2,11 +2,6 @@ package result
 
 import "context"
 
-type Catchable interface {
-	Catch(err *error, contexts ...context.Context) bool
-	CatchErr(err ErrSetter, contexts ...context.Context) bool
-}
-
 // Checkable defines types that can be checked for Ok/Error state
 type Checkable interface {
 	IsOK() bool
@@ -20,7 +15,12 @@ type ErrSetter interface {
 	setErrorInner()
 }
 
+type Catchable interface {
+	CatchErr(err *error, contexts ...context.Context) bool
+	Catch(err ErrSetter, contexts ...context.Context) bool
+}
+
 type UnWrapper[T any] interface {
-	Unwrap(setter *error, contexts ...context.Context) T
-	UnwrapErr(setter ErrSetter, contexts ...context.Context) T
+	UnwrapErr(setter *error, contexts ...context.Context) T
+	Unwrap(setter ErrSetter, contexts ...context.Context) T
 }

v2/result/proxy_test.go

@@ -9,7 +9,7 @@ import (
 func TestProxy(t *testing.T) {
 	var gErr error
 	var err = ErrProxyOf(&gErr)
-	Errorf("test proxy error").Log().CatchErr(&err)
+	Errorf("test proxy error").Log().Catch(&err)
 	assert.NotNil(t, gErr)
 	assert.NotNil(t, err.GetErr())
 	assert.Equal(t, gErr, err.GetErr())

v2/result/result.go

@@ -82,11 +82,11 @@ func (r Result[T]) Must(events ...func(e *zerolog.Event)) T {
 	return r.getValue()
 }
 
-func (r Result[T]) Catch(setter *error, ctx ...context.Context) bool {
+func (r Result[T]) CatchErr(setter *error, ctx ...context.Context) bool {
 	return catchErr(newError(r.err), nil, setter, ctx...)
 }
 
-func (r Result[T]) CatchErr(setter ErrSetter, ctx ...context.Context) bool {
+func (r Result[T]) Catch(setter ErrSetter, ctx ...context.Context) bool {
 	return catchErr(newError(r.err), setter, nil, ctx...)
 }
 
@@ -192,15 +192,15 @@ func (r Result[T]) WrapErr(err *errors.Err, tags ...errors.Tag) Result[T] {
 	return Result[T]{err: errors.WrapTag(errors.WrapCaller(err, 1), tags...)}
 }
 
-func (r Result[T]) Unwrap(setter *error, contexts ...context.Context) T {
+func (r Result[T]) UnwrapErr(setter *error, contexts ...context.Context) T {
 	ret, err := unwrapErr(r, setter, nil, contexts...)
 	if err != nil {
 		*setter = errors.WrapCaller(err, 1)
 	}
 	return ret
 }
 
-func (r Result[T]) UnwrapErr(setter ErrSetter, contexts ...context.Context) T {
+func (r Result[T]) Unwrap(setter ErrSetter, contexts ...context.Context) T {
 	ret, err := unwrapErr(r, nil, setter, contexts...)
 	if err != nil {
 		setError(setter, errors.WrapCaller(err, 1))

v2/result/result_test.go

@@ -47,17 +47,17 @@ func TestErrOf(t *testing.T) {
 	resultchecker.RegisterErrCheck(log.RecordErr())
 
 	var err result.Error
-	if fn1().CatchErr(&err, ctx) {
+	if fn1().Catch(&err, ctx) {
 		errors.Debug(err.GetErr())
 	}
 }
 
 func fn1() (r result.Result[string]) {
-	if fn3().CatchErr(&r) {
+	if fn3().Catch(&r) {
 		return
 	}
 
-	val := fn2().UnwrapErr(&r)
+	val := fn2().Unwrap(&r)
 	if r.IsErr() {
 		return
 	}
@@ -70,7 +70,7 @@ func fn2() (r result.Result[string]) {
 		InspectErr(func(err error) {
 			log.Err(err).Msg("test error")
 		}).
-		CatchErr(&r)
+		Catch(&r)
 	if r.IsErr() {
 		return
 	}