chore: quick update fix/version at 2025-09-15 23:50:34

Author: kooksee

assert/util.go

@@ -5,8 +5,11 @@ import (
 	"log/slog"
 	"reflect"
 	"runtime/debug"
+	"sync"
 
 	"github.com/k0kubun/pp/v3"
+	"github.com/pubgo/funk/log/logfields"
+	"github.com/samber/lo"
 )
 
 func messageFromMsgAndArgs(msgAndArgs ...any) string {
@@ -20,7 +23,21 @@ func messageFromMsgAndArgs(msgAndArgs ...any) string {
 		}
 	}
 
-	return pp.Sprint(msgAndArgs...)
+	return pretty().Sprint(msgAndArgs...)
+}
+
+func logErr(err error, message string, attrs ...slog.Attr) {
+	if err == nil {
+		return
+	}
+
+	attrs = append(attrs,
+		slog.String(logfields.Module, "assert"),
+		slog.String(logfields.Error, err.Error()),
+		slog.String("stack", string(debug.Stack())),
+		slog.String(logfields.ErrorDetail, pretty().Sprint(err)),
+	)
+	slog.Error(message, lo.ToAnySlice(attrs)...)
 }
 
 func must(err error, messageArgs ...any) {
@@ -35,26 +52,36 @@ func must(err error, messageArgs ...any) {
 		message = fmt.Sprintf("msg:%v err:%s", message, err.Error())
 	}
 
-	slog.Error(message)
-	debug.PrintStack()
+	logErr(err, message, slog.Bool("panic", true))
 	panic(err)
 }
 
+var pretty = sync.OnceValue(func() *pp.PrettyPrinter {
+	printer := pp.New()
+	printer.SetColoringEnabled(false)
+	printer.SetExportedOnly(false)
+	printer.SetOmitEmpty(true)
+	printer.SetMaxDepth(5)
+	return printer
+})
+
 func try(fn func() error) (gErr error) {
 	if fn == nil {
-		gErr = fmt.Errorf("[fn] is nil")
+		gErr = fmt.Errorf("assert: [fn] is nil")
+		logErr(gErr, gErr.Error())
+		debug.PrintStack()
 		return
 	}
 
-	defer func() {
-		if gErr != nil {
-			gErr = fmt.Errorf("stack:%s, err:%w", reflect.TypeOf(fn).String(), gErr)
-		}
-	}()
-
 	defer func() {
 		if err := recover(); err != nil {
 			gErr = fmt.Errorf("%v", err)
+			logErr(gErr, gErr.Error())
+			debug.PrintStack()
+		}
+
+		if gErr != nil {
+			gErr = fmt.Errorf("stack:%s, err:%w", reflect.TypeOf(fn).String(), gErr)
 		}
 	}()
 

errors/errcheck/check.go

@@ -4,40 +4,54 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/pubgo/funk/assert"
 	"github.com/pubgo/funk/errors"
+	"github.com/pubgo/funk/errors/errinter"
 	"github.com/pubgo/funk/log"
 	"github.com/samber/lo"
 )
 
 func RecoveryAndCheck(setter *error, callbacks ...func(err error) error) {
 	if setter == nil {
-		errMust(fmt.Errorf("setter is nil"))
+		assert.Must(fmt.Errorf("errcheck: setter is nil"))
 		return
 	}
 
-	err := errors.Parse(recover())
-	gErr := *setter
-	if err == nil && gErr == nil {
-		return
+	err := errinter.ParseError(recover())
+	if err != nil {
+		err = errors.WrapStack(err)
 	}
 
+	gErr := *setter
 	if err == nil {
 		err = gErr
 	}
 
+	if err == nil {
+		return
+	}
+
 	for _, fn := range callbacks {
 		err = fn(err)
 		if err == nil {
 			return
 		}
 	}
 
-	*setter = errors.WrapCaller(err, 1)
+	*setter = err
 }
 
 func Check(errSetter *error, err error, contexts ...context.Context) bool {
+	defer func() {
+		if *errSetter == nil {
+			return
+		}
+
+		logErr(lo.FirstOr(contexts, nil), *errSetter)
+	}()
+
 	if errSetter == nil {
-		errMust(fmt.Errorf("errSetter is nil"))
+		assert.Must(fmt.Errorf("errcheck: errSetter is nil"))
 		return false
 	}
 
@@ -51,7 +65,7 @@ func Check(errSetter *error, err error, contexts ...context.Context) bool {
 	}
 
 	var ctx = lo.FirstOr(contexts, context.Background())
-	for _, fn := range GetCheckersFromCtx(ctx) {
+	for _, fn := range getCheckersFromCtx(ctx) {
 		err = fn(ctx, err)
 		if err == nil {
 			return false
@@ -62,14 +76,15 @@ func Check(errSetter *error, err error, contexts ...context.Context) bool {
 	return true
 }
 
-func Expect(err error, format string, args ...any) {
-	if err == nil {
-		return
-	}
+func Must(err error, args ...any) {
+	logErr(nil, err)
+	errNilOrPanic(err, args...)
+}
 
-	err = errors.WrapCaller(err, 1)
-	err = errors.Wrapf(err, format, args...)
-	errMust(err)
+func Must1[T any](v T, err error) T {
+	logErr(nil, err)
+	errNilOrPanic(err)
+	return v
 }
 
 func Map(err error, fn func(err error) error) error {
@@ -88,12 +103,12 @@ func Inspect(err error, fn func(err error)) {
 	fn(err)
 }
 
-func InspectLog(err error, fn func(logger *log.Event), contexts ...context.Context) {
+func InspectLog(err error, fn func(evt *log.Event), contexts ...context.Context) {
 	if err == nil {
 		return
 	}
 
-	fn(log.Err(err, contexts...))
+	logErr(lo.FirstOr(contexts, nil), err, fn)
 }
 
 func LogErr(err error, contexts ...context.Context) {

errors/errcheck/context.go

@@ -25,7 +25,7 @@ func CreateCtx(ctx context.Context, errChecks []ErrChecker, upsert ...bool) cont
 	return context.WithValue(ctx, checkCtx{}, errChecks)
 }
 
-func GetCheckersFromCtx(ctx context.Context) []ErrChecker {
+func getCheckersFromCtx(ctx context.Context) []ErrChecker {
 	if ctx == nil {
 		return nil
 	}

errors/errcheck/util.go

@@ -1,12 +1,20 @@
 package errcheck
 
 import (
+	"context"
 	"fmt"
+	"runtime/debug"
+	"sync"
 
+	"github.com/k0kubun/pp/v3"
 	"github.com/pubgo/funk/errors"
+	"github.com/pubgo/funk/log"
+	"github.com/pubgo/funk/log/logfields"
+	"github.com/rs/zerolog"
+	"google.golang.org/protobuf/encoding/prototext"
 )
 
-func errMust(err error, args ...any) {
+func errNilOrPanic(err error, args ...any) {
 	if err == nil {
 		return
 	}
@@ -19,3 +27,33 @@ func errMust(err error, args ...any) {
 	errors.Debug(err)
 	panic(err)
 }
+
+func logErr(ctx context.Context, err error, events ...func(e *zerolog.Event)) {
+	if err == nil {
+		return
+	}
+
+	log.Error(ctx).
+		Func(func(e *zerolog.Event) {
+			e.Str(logfields.Module, "errcheck")
+			e.Str("stack", string(debug.Stack()))
+			e.Str(logfields.ErrorDetail, pretty().Sprint(err))
+			e.Str(logfields.ErrorID, errors.GetErrorId(err))
+
+			for _, fn := range events {
+				fn(e)
+			}
+		}).
+		Str(logfields.Error, err.Error()).
+		CallerSkipFrame(2).
+		Msgf("%s\n%s\n", err.Error(), prototext.Format(errors.ParseErrToPb(err)))
+}
+
+var pretty = sync.OnceValue(func() *pp.PrettyPrinter {
+	printer := pp.New()
+	printer.SetColoringEnabled(false)
+	printer.SetExportedOnly(false)
+	printer.SetOmitEmpty(true)
+	printer.SetMaxDepth(5)
+	return printer
+})

errors/errinter/utils.go

@@ -83,7 +83,7 @@ func Debug(err error) {
 		return
 	}
 
-	Console().Println(err)
+	DebugPretty().Println(err)
 }
 
 func MustTagsToAny(tags ...*errorpb.Tag) []*anypb.Any {
@@ -160,7 +160,7 @@ var errPretty = sync.OnceValue(func() *pp.PrettyPrinter {
 	return printer
 })
 
-var Console = sync.OnceValue(func() *pp.PrettyPrinter {
+var DebugPretty = sync.OnceValue(func() *pp.PrettyPrinter {
 	printer := pp.New()
 	printer.SetColoringEnabled(true)
 	printer.SetExportedOnly(false)

errors/must.go

@@ -3,36 +3,20 @@ package errors
 import (
 	"fmt"
 	"os"
+
+	"github.com/pubgo/funk/assert"
 )
 
 func Must(err error, args ...interface{}) {
-	if err == nil {
-		return
-	}
-
-	err = WrapStack(Wrap(err, fmt.Sprint(args...)))
-	Debug(err)
-	panic(err)
+	assert.Must(err, args...)
 }
 
 func MustF(err error, msg string, args ...interface{}) {
-	if err == nil {
-		return
-	}
-
-	err = WrapStack(Wrap(err, fmt.Sprintf(msg, args...)))
-	Debug(err)
-	panic(err)
+	assert.MustF(err, msg, args...)
 }
 
 func Must1[T any](ret T, err error) T {
-	if err != nil {
-		err = WrapStack(err)
-		Debug(err)
-		panic(err)
-	}
-
-	return ret
+	return assert.Must1(ret, err)
 }
 
 func Exit(err error, args ...interface{}) {

log/logfields/fields.go

@@ -7,4 +7,5 @@ const (
 	Error       = "error"
 	ErrorDetail = "error_detail"
 	ErrorStack  = "error_stack"
+	ErrorID     = "error_id"
 )

v2/result/result.go

@@ -73,6 +73,7 @@ func (r Result[T]) Expect(format string, args ...any) T {
 
 func (r Result[T]) Must() T {
 	if r.IsErr() {
+		logErr(nil, r.err)
 		errNilOrPanic(errors.WrapCaller(r.getErr(), 1))
 	}
 

v2/result/util.go

@@ -255,5 +255,5 @@ func logErr(ctx context.Context, err error, events ...func(e *zerolog.Event)) {
 		}).
 		Str(zerolog.ErrorFieldName, err.Error()).
 		CallerSkipFrame(2).
-		Msgf("%s\n%s", err.Error(), prototext.Format(errors.ParseErrToPb(err)))
+		Msgf("%s\n%s\n", err.Error(), prototext.Format(errors.ParseErrToPb(err)))
 }