diff --git a/Makefile b/Makefile index f46949f6..4d3b1976 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,10 @@ extension: postgres: docker run --rm --name pg -p 5432:5432 -e POSTGRES_PASSWORD=pwd -d postgres +.PHONY: tidy +tidy: + find . -name go.mod -execdir go mod tidy \; + .PHONY: cover cover: go test -coverprofile cover.out ./... diff --git a/cfg.go b/cfg.go index 1e73ff31..96c7dbfc 100644 --- a/cfg.go +++ b/cfg.go @@ -13,6 +13,7 @@ import ( modFilepath "github.com/risor-io/risor/modules/filepath" modFmt "github.com/risor-io/risor/modules/fmt" modHash "github.com/risor-io/risor/modules/hash" + modJmesPath "github.com/risor-io/risor/modules/jmespath" modJson "github.com/risor-io/risor/modules/json" modMath "github.com/risor-io/risor/modules/math" modOs "github.com/risor-io/risor/modules/os" @@ -84,6 +85,7 @@ func (cfg *Config) addDefaultGlobals() { builtins := []map[string]object.Object{ builtins.Builtins(), modFetch.Builtins(), + modJmesPath.Builtins(), modFmt.Builtins(), modHash.Builtins(), modOs.Builtins(), diff --git a/cmd/risor-api/go.mod b/cmd/risor-api/go.mod index bfb7e076..05a5b591 100644 --- a/cmd/risor-api/go.mod +++ b/cmd/risor-api/go.mod @@ -12,7 +12,9 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect + github.com/jmespath-community/go-jmespath v1.1.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + golang.org/x/exp v0.0.0-20230314191032-db074128a8ec // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/cmd/risor-api/go.sum b/cmd/risor-api/go.sum index b611d4d2..494d8b91 100644 --- a/cmd/risor-api/go.sum +++ b/cmd/risor-api/go.sum @@ -3,6 +3,8 @@ 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/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/jmespath-community/go-jmespath v1.1.1 h1:bFikPhsi/FdmlZhVgSCd2jj1e7G/rw+zyQfyg5UF+L4= +github.com/jmespath-community/go-jmespath v1.1.1/go.mod h1:4gOyFJsR/Gk+05RgTKYrifT7tBPWD8Lubtb5jRrfy9I= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -13,6 +15,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +golang.org/x/exp v0.0.0-20230314191032-db074128a8ec h1:pAv+d8BM2JNnNctsLJ6nnZ6NqXT8N4+eauvZSb3P0I0= +golang.org/x/exp v0.0.0-20230314191032-db074128a8ec/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/cmd/risor/go.mod b/cmd/risor/go.mod index e65902d2..602dc35e 100644 --- a/cmd/risor/go.mod +++ b/cmd/risor/go.mod @@ -105,6 +105,7 @@ require ( github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgx/v5 v5.5.0 // indirect + github.com/jmespath-community/go-jmespath v1.1.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -123,6 +124,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect golang.org/x/crypto v0.17.0 // indirect + golang.org/x/exp v0.0.0-20230314191032-db074128a8ec // indirect golang.org/x/image v0.14.0 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect diff --git a/cmd/risor/go.sum b/cmd/risor/go.sum index 3ab18881..3f4e58fc 100644 --- a/cmd/risor/go.sum +++ b/cmd/risor/go.sum @@ -312,6 +312,8 @@ github.com/jackc/pgx/v5 v5.5.0/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSlj github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jmespath-community/go-jmespath v1.1.1 h1:bFikPhsi/FdmlZhVgSCd2jj1e7G/rw+zyQfyg5UF+L4= +github.com/jmespath-community/go-jmespath v1.1.1/go.mod h1:4gOyFJsR/Gk+05RgTKYrifT7tBPWD8Lubtb5jRrfy9I= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= @@ -479,6 +481,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20230314191032-db074128a8ec h1:pAv+d8BM2JNnNctsLJ6nnZ6NqXT8N4+eauvZSb3P0I0= +golang.org/x/exp v0.0.0-20230314191032-db074128a8ec/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= diff --git a/examples/go/struct/go.mod b/examples/go/struct/go.mod index 35b55121..904fa57d 100644 --- a/examples/go/struct/go.mod +++ b/examples/go/struct/go.mod @@ -10,7 +10,9 @@ require ( ) require ( + github.com/jmespath-community/go-jmespath v1.1.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect + golang.org/x/exp v0.0.0-20230314191032-db074128a8ec // indirect golang.org/x/sys v0.14.0 // indirect ) diff --git a/examples/go/struct/go.sum b/examples/go/struct/go.sum index 1c3a5cd4..0b578a13 100644 --- a/examples/go/struct/go.sum +++ b/examples/go/struct/go.sum @@ -2,6 +2,8 @@ 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/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/jmespath-community/go-jmespath v1.1.1 h1:bFikPhsi/FdmlZhVgSCd2jj1e7G/rw+zyQfyg5UF+L4= +github.com/jmespath-community/go-jmespath v1.1.1/go.mod h1:4gOyFJsR/Gk+05RgTKYrifT7tBPWD8Lubtb5jRrfy9I= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -11,6 +13,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +golang.org/x/exp v0.0.0-20230314191032-db074128a8ec h1:pAv+d8BM2JNnNctsLJ6nnZ6NqXT8N4+eauvZSb3P0I0= +golang.org/x/exp v0.0.0-20230314191032-db074128a8ec/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= diff --git a/examples/scripts/jmespath.risor b/examples/scripts/jmespath.risor new file mode 100755 index 00000000..83b90e90 --- /dev/null +++ b/examples/scripts/jmespath.risor @@ -0,0 +1,13 @@ +#!/usr/bin/env risor -- + +data := { + "locations": [ + {"name": "Seattle", "state": "WA"}, + {"name": "New York", "state": "NY"}, + {"name": "Bellevue", "state": "WA"}, + {"name": "Olympia", "state": "WA"}, + ], +} | jmespath("locations[?state == 'WA'].name | sort(@) | {WashingtonCities: join(', ', @)}") + +print(data) +print(jmespath(data, "split(WashingtonCities, ',')")[0]) diff --git a/go.mod b/go.mod index 3e2af27e..bccabff9 100644 --- a/go.mod +++ b/go.mod @@ -2,13 +2,17 @@ module github.com/risor-io/risor go 1.21 -require github.com/stretchr/testify v1.8.4 +require ( + github.com/jmespath-community/go-jmespath v1.1.1 + github.com/stretchr/testify v1.8.4 +) require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect + golang.org/x/exp v0.0.0-20230314191032-db074128a8ec // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 3ee4af40..ef4b090d 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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/jmespath-community/go-jmespath v1.1.1 h1:bFikPhsi/FdmlZhVgSCd2jj1e7G/rw+zyQfyg5UF+L4= +github.com/jmespath-community/go-jmespath v1.1.1/go.mod h1:4gOyFJsR/Gk+05RgTKYrifT7tBPWD8Lubtb5jRrfy9I= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -16,6 +18,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +golang.org/x/exp v0.0.0-20230314191032-db074128a8ec h1:pAv+d8BM2JNnNctsLJ6nnZ6NqXT8N4+eauvZSb3P0I0= +golang.org/x/exp v0.0.0-20230314191032-db074128a8ec/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/modules/all/all.go b/modules/all/all.go index 7b529b92..6aeac078 100644 --- a/modules/all/all.go +++ b/modules/all/all.go @@ -9,6 +9,7 @@ import ( modFilepath "github.com/risor-io/risor/modules/filepath" modFmt "github.com/risor-io/risor/modules/fmt" modHash "github.com/risor-io/risor/modules/hash" + modJmesPath "github.com/risor-io/risor/modules/jmespath" modJson "github.com/risor-io/risor/modules/json" modMath "github.com/risor-io/risor/modules/math" modOs "github.com/risor-io/risor/modules/os" @@ -51,5 +52,8 @@ func Builtins() map[string]object.Object { for k, v := range modOs.Builtins() { result[k] = v } + for k, v := range modJmesPath.Builtins() { + result[k] = v + } return result } diff --git a/modules/fetch/fetch.go b/modules/fetch/fetch.go index 4de93ae4..19e9759f 100644 --- a/modules/fetch/fetch.go +++ b/modules/fetch/fetch.go @@ -12,7 +12,7 @@ import ( func Fetch(ctx context.Context, args ...object.Object) object.Object { numArgs := len(args) if numArgs < 1 || numArgs > 2 { - return object.NewArgsRangeError("fetch", 1, 2, len(args)) + return object.NewArgsRangeError("fetch", 1, 2, numArgs) } urlArg, argErr := object.AsString(args[0]) if argErr != nil { diff --git a/modules/jmespath/jmespath.go b/modules/jmespath/jmespath.go new file mode 100644 index 00000000..388801cc --- /dev/null +++ b/modules/jmespath/jmespath.go @@ -0,0 +1,48 @@ +package jmespath + +import ( + "context" + "fmt" + + "github.com/jmespath-community/go-jmespath/pkg/api" + "github.com/jmespath-community/go-jmespath/pkg/parsing" + "github.com/risor-io/risor/object" +) + +func Jmespath(ctx context.Context, args ...object.Object) object.Object { + numArgs := len(args) + + if numArgs != 2 { + return object.NewArgsError("jmespath", 2, numArgs) + } + + data, argsErr := object.AsMap(args[0]) + if argsErr != nil { + return argsErr + } + + expression, argsErr := object.AsString(args[1]) + if argsErr != nil { + return argsErr + } + + parser := parsing.NewParser() + if _, err := parser.Parse(expression); err != nil { + if syntaxError, ok := err.(parsing.SyntaxError); ok { + return object.NewError(fmt.Errorf("%s\n%s", syntaxError, syntaxError.HighlightLocation())) + } + return object.NewError(err) + } + result, err := api.Search(expression, data.Interface()) + if argsErr != nil { + return object.NewError(err) + } + + return object.FromGoType(result) +} + +func Builtins() map[string]object.Object { + return map[string]object.Object{ + "jmespath": object.NewBuiltin("jmespath", Jmespath), + } +}