chore: quick update feat/feature_ext at 2026-01-13 14:51:41

Author: kooksee

config/util.go

@@ -241,11 +241,12 @@ func evalData(template []byte, cfg *config) []byte {
 		}
 
 		tag = fmt.Sprintf("${%s}", tag)
-		return w.Write(bytes.TrimSpace([]byte(result.Wrap(envsubst.String(tag)).
+		return w.Write(result.Wrap(envsubst.Bytes([]byte(tag))).
+			Map(bytes.TrimSpace).
 			UnwrapOrLog(func(e result.Event) {
 				e.Str("env", name)
 				e.Msg("failed to process env subst")
-			}))))
+			}))
 	}))
 }
 

result/api.go

@@ -140,7 +140,7 @@ func MapTo[T, U any](r Result[T], fn func(T) U) Result[U] {
 	return OK(fn(r.getValue()))
 }
 
-func FlatMapTo[T, U any](r Result[T], fn func(T) Result[U]) Result[U] {
+func MapValTo[T, U any](r Result[T], fn func(T) Result[U]) Result[U] {
 	if r.IsErr() {
 		return Fail[U](errors.WrapCaller(r.getErr(), 1))
 	}

result/event.go

@@ -0,0 +1,24 @@
+package result
+
+import (
+	"fmt"
+
+	"github.com/pubgo/funk/v2/log"
+	"github.com/pubgo/funk/v2/log/logfields"
+)
+
+type Event struct {
+	*log.Event
+}
+
+func (e Event) Msg(msg string) {
+	e.Str(logfields.Msg, msg)
+}
+
+func (e Event) MsgFunc(createMsg func() string) {
+	e.Str(logfields.Msg, createMsg())
+}
+
+func (e Event) Msgf(format string, v ...any) {
+	e.Str(logfields.Msg, fmt.Sprintf(format, v...))
+}

result/result.go

@@ -300,8 +300,8 @@ func (r Result[T]) Map(fn func(val T) T) Result[T] {
 	return OK(fn(r.getValue()))
 }
 
-// FlatMap calls fn with the value if the result is OK, then returns the result unchanged.
-func (r Result[T]) FlatMap(fn func(val T) Result[T]) Result[T] {
+// MapVal calls fn with the value if the result is OK, then returns the result unchanged.
+func (r Result[T]) MapVal(fn func(val T) Result[T]) Result[T] {
 	if r.IsErr() {
 		return r
 	}

result/result_test.go

@@ -104,7 +104,7 @@ func TestMoreReasonableErrorHandling(t *testing.T) {
 	})
 
 	// Apply a function that might fail
-	finalResult := result.FlatMapTo(strResult, func(s string) result.Result[int] {
+	finalResult := result.MapValTo(strResult, func(s string) result.Result[int] {
 		if len(s) > 10 {
 			return result.Fail[int](fmt.Errorf("string too long"))
 		}
@@ -123,7 +123,7 @@ func TestMoreReasonableErrorHandling(t *testing.T) {
 	errResult := result.Fail[string](fmt.Errorf("initial error"))
 
 	// Chain operations on an error result
-	chainedResult := result.FlatMapTo(errResult, func(_ string) result.Result[int] {
+	chainedResult := result.MapValTo(errResult, func(_ string) result.Result[int] {
 		return result.OK(100)
 	})
 

result/util.go

@@ -378,18 +378,3 @@ func logErr(ctx context.Context, skip int, err error, events ...func(e Event)) {
 		}).
 		Msgf("%s\n%s", err.Error(), errors.JsonPrint(err))
 }
-
-type Event struct {
-	*log.Event
-}
-
-func (e Event) Msg(msg string) {
-	e.Str(logfields.Msg, msg)
-}
-func (e Event) MsgFunc(createMsg func() string) {
-	e.Str(logfields.Msg, createMsg())
-}
-
-func (e Event) Msgf(format string, v ...any) {
-	e.Str(logfields.Msg, fmt.Sprintf(format, v...))
-}