diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 6b08303..754af40 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -14,7 +14,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.24 + go-version: 1.25 - uses: actions/setup-node@v4 with: node-version: 21.1 diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml index 8441947..b58a727 100644 --- a/.forgejo/workflows/test.yaml +++ b/.forgejo/workflows/test.yaml @@ -14,7 +14,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.22.4 + go-version: 1.25 - name: Build run: | make test \ No newline at end of file diff --git a/go.mod b/go.mod index b7b4cb6..b397a0c 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,20 @@ module ucl.lmika.dev -go 1.24 +go 1.25 require ( github.com/alecthomas/participle/v2 v2.1.1 github.com/chzyer/readline v1.5.1 - github.com/lmika/gopkgs v0.0.0-20240408110817-a02f6fc67d1f github.com/stretchr/testify v1.10.0 - lmika.dev/pkg/modash v0.0.0-20250619112300-0be0b6b35b1b + github.com/yuin/goldmark v1.7.8 + go.abhg.dev/goldmark/frontmatter v0.2.0 + lmika.dev/pkg/modash v0.1.0 ) require ( github.com/BurntSushi/toml v1.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/yuin/goldmark v1.7.8 // indirect - go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 99a7730..98d9414 100644 --- a/go.sum +++ b/go.sum @@ -16,24 +16,19 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= -github.com/lmika/gopkgs v0.0.0-20240408110817-a02f6fc67d1f h1:tz68Lhc1oR15HVz69IGbtdukdH0x70kBDEvvj5pTXyE= -github.com/lmika/gopkgs v0.0.0-20240408110817-a02f6fc67d1f/go.mod h1:zHQvhjGXRro/Xp2C9dbC+ZUpE0gL4GYW75x1lk7hwzI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= go.abhg.dev/goldmark/frontmatter v0.2.0 h1:P8kPG0YkL12+aYk2yU3xHv4tcXzeVnN+gU0tJ5JnxRw= go.abhg.dev/goldmark/frontmatter v0.2.0/go.mod h1:XqrEkZuM57djk7zrlRUB02x8I5J0px76YjkOzhB4YlU= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -lmika.dev/pkg/modash v0.0.0-20250619112300-0be0b6b35b1b h1:Oymcj66pgyJ2CtGk9lPh06P4FOekllE1iPehDwaL0vw= -lmika.dev/pkg/modash v0.0.0-20250619112300-0be0b6b35b1b/go.mod h1:8NDl/yR1eCCEhip9FJlVuMNXIeaztQ0Ks/tizExFcTI= +lmika.dev/pkg/modash v0.1.0 h1:fltroSvP0nKj9K0E6G+S9LULvB9Qhj47+SZ2b9v/v/c= +lmika.dev/pkg/modash v0.1.0/go.mod h1:8NDl/yR1eCCEhip9FJlVuMNXIeaztQ0Ks/tizExFcTI= diff --git a/repl/docs.go b/repl/docs.go index 40e3485..86b68d9 100644 --- a/repl/docs.go +++ b/repl/docs.go @@ -4,7 +4,7 @@ import ( "context" "errors" "fmt" - "github.com/lmika/gopkgs/fp/maps" + "lmika.dev/pkg/modash/momap" "os" "slices" "sort" @@ -33,7 +33,7 @@ func (d Doc) config(cmdName string, r *REPL) { func (r *REPL) helpBuiltin(ctx context.Context, args ucl.CallArgs) (any, error) { switch { case args.NArgs() == 0: - names := maps.Keys(r.commandDocs) + names := momap.Keys(r.commandDocs) sort.Strings(names) tabWriter := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0) diff --git a/ucl/objs.go b/ucl/objs.go index cf98303..76ea074 100644 --- a/ucl/objs.go +++ b/ucl/objs.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/lmika/gopkgs/fp/slices" + "lmika.dev/pkg/modash/moslice" ) type Object interface { @@ -626,7 +626,7 @@ func newStructProxyObject(v reflect.Value, orig reflect.Value) structProxyObject return structProxyObject{ v: v, orig: orig, - vf: slices.Filter(reflect.VisibleFields(v.Type()), func(t reflect.StructField) bool { return t.IsExported() }), + vf: moslice.Filter(reflect.VisibleFields(v.Type()), func(t reflect.StructField) bool { return t.IsExported() }), } } diff --git a/ucl/userbuiltin.go b/ucl/userbuiltin.go index 4bf40b9..87046f3 100644 --- a/ucl/userbuiltin.go +++ b/ucl/userbuiltin.go @@ -5,7 +5,7 @@ import ( "errors" "reflect" - "github.com/lmika/gopkgs/fp/slices" + "lmika.dev/pkg/modash/moslice" ) type BuiltinHandler func(ctx context.Context, args CallArgs) (any, error) @@ -291,7 +291,7 @@ func (i Invokable) Invoke(ctx context.Context, args ...any) (any, error) { inst: i.inst, } - invArgs.args, err = slices.MapWithError(args, func(a any) (Object, error) { + invArgs.args, err = moslice.MapWithError(args, func(a any) (Object, error) { return fromGoValue(a) }) if err != nil {