Merge branch 'fix/version' of github.com:pubgo/funk into fix/version

Author: kooksee

config/envs.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/pubgo/funk/env"
-	"github.com/samber/lo"
+	"github.com/pubgo/funk/strutil"
 )
 
 type EnvSpecMap map[string]*EnvSpec
@@ -13,14 +13,14 @@ type EnvSpec struct {
 	Name        string `yaml:"name"`
 	Description string `yaml:"description"`
 	Default     string `yaml:"default"`
+	Value       string `yaml:"value"`
 	Required    bool   `yaml:"required"`
 	Example     string `yaml:"example"`
 }
 
 func initEnv(envMap EnvSpecMap) {
 	for name, cfg := range envMap {
-		envData := env.Get(name)
-		envData = strings.TrimSpace(lo.Ternary(envData != "", envData, cfg.Default))
+		envData := strings.TrimSpace(strutil.FirstNotEmpty(env.Get(name), cfg.Value, cfg.Default))
 		if cfg.Required && envData == "" {
 			panic("env " + cfg.Name + " is required")
 		}

env/env.go

@@ -121,7 +121,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.Catch(&r, godotenv.Load(files...)) {
+	if result.Catch(&r, godotenv.Overload(files...)) {
 		return
 	}
 

log/impl.slog.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"log/slog"
 
+	"github.com/pubgo/funk/log/slogutil"
 	"github.com/rs/zerolog"
 	slogcommon "github.com/samber/slog-common"
 )
@@ -56,7 +57,11 @@ func (s slogImpl) Handle(ctx context.Context, r slog.Record) error {
 	}
 
 	r.Attrs(func(attr slog.Attr) bool {
-		evt.Any(attr.Key, attr.Value.Any())
+		if fn, ok := attr.Value.Any().(slogutil.LogFunc); ok {
+			evt.Func(fn)
+		} else {
+			evt.Any(attr.Key, attr.Value.Any())
+		}
 		return true
 	})
 

log/slogutil/util.go

@@ -0,0 +1,13 @@
+package slogutil
+
+import (
+	"log/slog"
+
+	"github.com/rs/zerolog"
+)
+
+type LogFunc func(evt *zerolog.Event)
+
+func Func(fn LogFunc) slog.Attr {
+	return slog.Any("func", fn)
+}

log/z_slog_test.go

@@ -0,0 +1,18 @@
+package log_test
+
+import (
+	"log/slog"
+	"testing"
+
+	"github.com/pubgo/funk/log"
+	"github.com/pubgo/funk/log/slogutil"
+	"github.com/rs/zerolog"
+)
+
+func TestSlog(t *testing.T) {
+	slog.SetDefault(slog.New(log.NewSlog(log.GetLogger(""))))
+	slog.Info("ok")
+	slog.Info("ok", slogutil.Func(func(evt *zerolog.Event) {
+		evt.Str("record", "ok")
+	}))
+}