chore: quick update fix/version at 2025-09-23 22:03:55

Author: kooksee

config/config.go

@@ -83,14 +83,22 @@ func loadEnvConfigMap(cfgPath string) EnvSpecMap {
 
 		pathList := listAllPath(envPath).Expect("failed to list env config path: %s", envPath)
 		for _, p := range pathList {
-			envConfigBytes := result.Wrap(os.ReadFile(p)).Expect("failed to handler env config data, path=%s", p)
-			envConfigBytes = bytes.TrimSpace(envConfigBytes)
+			envConfigBytes := result.Wrap(os.ReadFile(p)).
+				Map(bytes.TrimSpace).
+				Must(func(e *zerolog.Event) {
+					e.Str(logfields.Msg, fmt.Sprintf("failed to handler env config data, path=%s", p))
+				})
 			if len(envConfigBytes) == 0 {
 				continue
 			}
 
-			envConfigBytes = result.Wrap(envsubst.Bytes(envConfigBytes)).Expect("failed to handler config env data: %s", envConfigBytes)
-			assert.MustF(yaml.Unmarshal(envConfigBytes, &envSpecMap), "failed to unmarshal env config, data=%s path=%s", envConfigBytes, p)
+			envConfigBytes = cfgFormat(envConfigBytes, &config{workDir: filepath.Dir(cfgPath)})
+			envConfigBytes = result.Wrap(envsubst.Bytes(envConfigBytes)).Must(func(e *zerolog.Event) {
+				e.Str(logfields.Msg, fmt.Sprintf("failed to handler config env data: %s", envConfigBytes))
+			})
+			result.Must(yaml.Unmarshal(envConfigBytes, &envSpecMap), func(e *zerolog.Event) {
+				e.Str(logfields.Msg, fmt.Sprintf("failed to unmarshal env config, data=%s path=%s", envConfigBytes, p))
+			})
 		}
 	}
 	initEnv(envSpecMap)

config/envs.go

@@ -15,8 +15,6 @@ type EnvSpec struct {
 	Default     string `yaml:"default"`
 	Required    bool   `yaml:"required"`
 	Example     string `yaml:"example"`
-	Versions    string `yaml:"versions"`
-	Tags        string `yaml:"tags"`
 }
 
 func initEnv(envMap EnvSpecMap) {

env/env.go

@@ -9,10 +9,11 @@ import (
 
 	"github.com/a8m/envsubst"
 	"github.com/joho/godotenv"
+	"github.com/samber/lo"
+
 	"github.com/pubgo/funk/assert"
 	"github.com/pubgo/funk/pathutil"
 	"github.com/pubgo/funk/v2/result"
-	"github.com/samber/lo"
 )
 
 func Set(key, value string) result.Error {

env/reload.go

@@ -8,10 +8,6 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-func init() {
-	loadEnv()
-}
-
 func Reload() {
 	loadEnv()
 }

v2/result/result.go

@@ -94,14 +94,14 @@ func (r Result[T]) IsErr() bool { return r.getErr() != nil }
 
 func (r Result[T]) IsOK() bool { return r.getErr() == nil }
 
-func (r Result[T]) InspectErr(fn func(error)) Result[T] {
+func (r Result[T]) InspectErr(fn func(err error)) Result[T] {
 	if r.IsErr() {
 		fn(r.getErr())
 	}
 	return r
 }
 
-func (r Result[T]) Inspect(fn func(T)) Result[T] {
+func (r Result[T]) Inspect(fn func(val T)) Result[T] {
 	if r.IsOK() {
 		fn(r.getValue())
 	}
@@ -118,21 +118,21 @@ func (r Result[T]) Log(events ...func(e *zerolog.Event)) Result[T] {
 	return r
 }
 
-func (r Result[T]) Map(fn func(T) T) Result[T] {
+func (r Result[T]) Map(fn func(val T) T) Result[T] {
 	if r.IsErr() {
 		return r
 	}
 	return OK(fn(r.getValue()))
 }
 
-func (r Result[T]) FlatMap(fn func(T) Result[T]) Result[T] {
+func (r Result[T]) FlatMap(fn func(val T) Result[T]) Result[T] {
 	if r.IsErr() {
 		return r
 	}
 	return fn(r.getValue())
 }
 
-func (r Result[T]) Validate(fn func(T) error) Result[T] {
+func (r Result[T]) Validate(fn func(val T) error) Result[T] {
 	if r.IsErr() {
 		return r
 	}
@@ -144,14 +144,14 @@ func (r Result[T]) Validate(fn func(T) error) Result[T] {
 	return OK(r.getValue())
 }
 
-func (r Result[T]) MapErr(fn func(error) error) Result[T] {
+func (r Result[T]) MapErr(fn func(err error) error) Result[T] {
 	if r.IsOK() {
 		return r
 	}
 	return Fail[T](fn(r.getErr()))
 }
 
-func (r Result[T]) MapErrOr(fn func(error) Result[T]) Result[T] {
+func (r Result[T]) MapErrOr(fn func(err error) Result[T]) Result[T] {
 	if r.IsOK() {
 		return r
 	}