From ef3deb75d9f9aecaee0fa93994fdeb1a8ab8fe70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 00:53:53 +0800 Subject: [PATCH 01/17] for jsonpath raw --- go.mod | 1 + go.sum | 109 +---------------------------------------------- lib/json/json.go | 109 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 107 deletions(-) diff --git a/go.mod b/go.mod index 9a840f40..f5f589cc 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/google/uuid v1.6.0 github.com/h2so5/here v0.0.0-20200815043652-5e14eb691fae github.com/montanaflynn/stats v0.7.1 + github.com/spyzhov/ajson v0.9.5 go.starlark.net v0.0.0-20240123142251-f86470692795 go.uber.org/atomic v1.11.0 go.uber.org/zap v1.24.0 diff --git a/go.sum b/go.sum index ade5c82b..1c8e74e7 100644 --- a/go.sum +++ b/go.sum @@ -1,138 +1,33 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/1set/starlight v0.1.2 h1:Lf+ktJPLeck5QJLnKGj+brFkBBtitQBWLvXVA0cTcq8= github.com/1set/starlight v0.1.2/go.mod h1:UBovtihT3K/JtaX+Nv/xBmdDk3LW6kr5yzqaYFo4KDQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/h2so5/here v0.0.0-20200815043652-5e14eb691fae h1:ghqI9EdSyyIL2iuOM9UIGVO7kEYQFVLKAUIFoOea5MY= github.com/h2so5/here v0.0.0-20200815043652-5e14eb691fae/go.mod h1:Q+Ziz4FsuRTHql1UqcQ3iZwl9LcKpi7mVVgn20Rj+IU= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/spyzhov/ajson v0.9.5 h1:/W2YIkLtwQ0W01qABeX89sXK1AV4+bUhc/3uLj3MToo= +github.com/spyzhov/ajson v0.9.5/go.mod h1:a6oSw0MMb7Z5aD2tPoPO+jq11ETKgXUr2XktHdT8Wt8= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.starlark.net v0.0.0-20240123142251-f86470692795 h1:LmbG8Pq7KDGkglKVn8VpZOZj6vb9b8nKEGcg9l03epM= go.starlark.net v0.0.0-20240123142251-f86470692795/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/lib/json/json.go b/lib/json/json.go index e505a712..b3df9255 100644 --- a/lib/json/json.go +++ b/lib/json/json.go @@ -4,9 +4,12 @@ package json import ( "bytes" "encoding/json" + "fmt" + "math" "sync" itn "github.com/1set/starlet/dataconv" + "github.com/spyzhov/ajson" stdjson "go.starlark.net/lib/json" "go.starlark.net/starlark" "go.starlark.net/starlarkstruct" @@ -33,6 +36,7 @@ func LoadModule() (starlark.StringDict, error) { "try_encode": starlark.NewBuiltin(ModuleName+".try_encode", tryEncode), "try_decode": starlark.NewBuiltin(ModuleName+".try_decode", tryDecode), "try_indent": starlark.NewBuiltin(ModuleName+".try_indent", tryIndent), + "path": starlark.NewBuiltin(ModuleName+".path", jsonPath), }, } for k, v := range stdjson.Module.Members { @@ -131,3 +135,108 @@ func tryIndent(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tupl } return starlark.Tuple{starlark.String(buf.String()), none}, nil } + +// jsonpath performs a JSONPath query on the given JSON data and returns the matching elements. +// It accepts a data object (Starlark value) and a JSONPath expression string. +func jsonPath(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { + var ( + data starlark.Value + pathExpr string + ) + if err := starlark.UnpackArgs(fn.Name(), args, kwargs, "data", &data, "path", &pathExpr); err != nil { + return none, err + } + + // Get the JSON data as a string + var jb []byte + switch v := data.(type) { + case starlark.String: + jb = []byte(v.GoString()) + case starlark.Bytes: + jb = []byte(v) + default: + // Serialize the Starlark value to a JSON string + js, err := itn.MarshalStarlarkJSON(data, 0) + if err != nil { + return none, fmt.Errorf("json.path: %w", err) + } + jb = []byte(js) + } + + // Use ajson to parse the JSON data and perform the JSONPath query + nodes, err := ajson.JSONPath(jb, pathExpr) + if err != nil { + return none, fmt.Errorf("json.path: %w", err) + } + + // Convert the resulting nodes to Starlark values + results := make([]starlark.Value, 0, len(nodes)) + for _, node := range nodes { + val, err := ajsonNodeToStarlarkValue(node) + if err != nil { + return none, fmt.Errorf("json.path: %w", err) + } + results = append(results, val) + } + + // Return the results as a Starlark list + return starlark.NewList(results), nil +} + +// ajsonNodeToStarlarkValue converts an ajson.Node to a Starlark value. +// It recursively traverses the node tree and constructs the corresponding Starlark values. +func ajsonNodeToStarlarkValue(node *ajson.Node) (starlark.Value, error) { + switch node.Type() { + case ajson.Object: + dict := &starlark.Dict{} + for _, key := range node.Keys() { + valNode, err := node.GetKey(key) + if err != nil { + return nil, err + } + val, err := ajsonNodeToStarlarkValue(valNode) + if err != nil { + return nil, err + } + err = dict.SetKey(starlark.String(key), val) + if err != nil { + return nil, err + } + } + return dict, nil + + case ajson.Array: + // Convert JSON array to Starlark list + elements, err := node.GetArray() + if err != nil { + return nil, err + } + vals := make([]starlark.Value, len(elements)) + for i, elem := range elements { + val, err := ajsonNodeToStarlarkValue(elem) + if err != nil { + return nil, err + } + vals[i] = val + } + return starlark.NewList(vals), nil + case ajson.String: + return starlark.String(node.MustString()), nil + case ajson.Numeric: + // Number value + num := node.MustNumeric() + if math.Mod(num, 1.0) == 0 { + // Integer value + return starlark.MakeInt64(int64(num)), nil + } else { + // Float value + return starlark.Float(num), nil + } + case ajson.Bool: + return starlark.Bool(node.MustBool()), nil + case ajson.Null: + return starlark.None, nil + default: + return nil, fmt.Errorf("unsupported JSON node type: %v", node.Type()) + } +} From bb61047ab08c3628e6d8ff9c60323943d3892dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 09:16:47 +0800 Subject: [PATCH 02/17] nice --- lib/json/json.go | 135 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 117 insertions(+), 18 deletions(-) diff --git a/lib/json/json.go b/lib/json/json.go index b3df9255..c257f661 100644 --- a/lib/json/json.go +++ b/lib/json/json.go @@ -37,6 +37,9 @@ func LoadModule() (starlark.StringDict, error) { "try_decode": starlark.NewBuiltin(ModuleName+".try_decode", tryDecode), "try_indent": starlark.NewBuiltin(ModuleName+".try_indent", tryIndent), "path": starlark.NewBuiltin(ModuleName+".path", jsonPath), + "try_path": starlark.NewBuiltin(ModuleName+".try_path", tryJsonPath), + "eval": starlark.NewBuiltin(ModuleName+".eval", jsonEval), + "try_eval": starlark.NewBuiltin(ModuleName+".try_eval", tryJsonEval), }, } for k, v := range stdjson.Module.Members { @@ -139,47 +142,144 @@ func tryIndent(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tupl // jsonpath performs a JSONPath query on the given JSON data and returns the matching elements. // It accepts a data object (Starlark value) and a JSONPath expression string. func jsonPath(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { + return executeJsonPath(thread, fn, args, kwargs, false) +} + +// tryJsonPath performs a JSONPath query on the given JSON data and returns the matching elements, along with any error occurred. +func tryJsonPath(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { + return executeJsonPath(thread, fn, args, kwargs, true) +} + +// executeJsonPath executes a JSONPath query and returns the results or an error tuple based on the try flag. +func executeJsonPath(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple, try bool) (starlark.Value, error) { var ( data starlark.Value pathExpr string ) if err := starlark.UnpackArgs(fn.Name(), args, kwargs, "data", &data, "path", &pathExpr); err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } return none, err } - // Get the JSON data as a string - var jb []byte + jb, err := getJsonBytes(data) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.path: %w", err) + } + + nodes, err := ajson.JSONPath(jb, pathExpr) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.path: %w", err) + } + + results, err := ajsonNodesToStarlarkList(nodes) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.path: %w", err) + } + + if try { + return starlark.Tuple{results, starlark.None}, nil + } + return results, nil +} + +// jsonEval evaluates a JSONPath query with an expression on the given JSON data and returns the evaluation result. +func jsonEval(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { + return executeJsonEval(thread, fn, args, kwargs, false) +} + +// tryJsonEval evaluates a JSONPath query with an expression on the given JSON data and returns the evaluation result, along with any error occurred. +func tryJsonEval(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { + return executeJsonEval(thread, fn, args, kwargs, true) +} + +// executeJsonEval executes a JSONPath evaluation and returns the result or an error tuple based on the try flag. +func executeJsonEval(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple, try bool) (starlark.Value, error) { + var ( + data starlark.Value + expr string + ) + if err := starlark.UnpackArgs(fn.Name(), args, kwargs, "data", &data, "expr", &expr); err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, err + } + + jb, err := getJsonBytes(data) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.eval: %w", err) + } + + root, err := ajson.Unmarshal(jb) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.eval: %w", err) + } + + result, err := ajson.Eval(root, expr) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.eval: %w", err) + } + + val, err := ajsonNodeToStarlarkValue(result) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.eval: %w", err) + } + + if try { + return starlark.Tuple{val, starlark.None}, nil + } + return val, nil +} + +// getJsonBytes converts a Starlark value to a JSON byte slice. +func getJsonBytes(data starlark.Value) ([]byte, error) { switch v := data.(type) { case starlark.String: - jb = []byte(v.GoString()) + return []byte(v.GoString()), nil case starlark.Bytes: - jb = []byte(v) + return []byte(v), nil default: - // Serialize the Starlark value to a JSON string js, err := itn.MarshalStarlarkJSON(data, 0) if err != nil { - return none, fmt.Errorf("json.path: %w", err) + return nil, err } - jb = []byte(js) - } - - // Use ajson to parse the JSON data and perform the JSONPath query - nodes, err := ajson.JSONPath(jb, pathExpr) - if err != nil { - return none, fmt.Errorf("json.path: %w", err) + return []byte(js), nil } +} - // Convert the resulting nodes to Starlark values +// ajsonNodesToStarlarkList converts a slice of ajson.Node to a Starlark list. +func ajsonNodesToStarlarkList(nodes []*ajson.Node) (starlark.Value, error) { results := make([]starlark.Value, 0, len(nodes)) for _, node := range nodes { val, err := ajsonNodeToStarlarkValue(node) if err != nil { - return none, fmt.Errorf("json.path: %w", err) + return nil, err } results = append(results, val) } - - // Return the results as a Starlark list return starlark.NewList(results), nil } @@ -204,7 +304,6 @@ func ajsonNodeToStarlarkValue(node *ajson.Node) (starlark.Value, error) { } } return dict, nil - case ajson.Array: // Convert JSON array to Starlark list elements, err := node.GetArray() From f51b6d56af09bd5505a59b5712e76b221d5a5ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 09:32:08 +0800 Subject: [PATCH 03/17] for refactor try --- lib/json/json.go | 169 +++++++++++++++++++++-------------------------- 1 file changed, 76 insertions(+), 93 deletions(-) diff --git a/lib/json/json.go b/lib/json/json.go index c257f661..344264b2 100644 --- a/lib/json/json.go +++ b/lib/json/json.go @@ -36,10 +36,10 @@ func LoadModule() (starlark.StringDict, error) { "try_encode": starlark.NewBuiltin(ModuleName+".try_encode", tryEncode), "try_decode": starlark.NewBuiltin(ModuleName+".try_decode", tryDecode), "try_indent": starlark.NewBuiltin(ModuleName+".try_indent", tryIndent), - "path": starlark.NewBuiltin(ModuleName+".path", jsonPath), - "try_path": starlark.NewBuiltin(ModuleName+".try_path", tryJsonPath), - "eval": starlark.NewBuiltin(ModuleName+".eval", jsonEval), - "try_eval": starlark.NewBuiltin(ModuleName+".try_eval", tryJsonEval), + "path": starlark.NewBuiltin(ModuleName+".path", generateJsonPath(false)), + "try_path": starlark.NewBuiltin(ModuleName+".try_path", generateJsonPath(true)), + "eval": starlark.NewBuiltin(ModuleName+".eval", generateJsonEval(false)), + "try_eval": starlark.NewBuiltin(ModuleName+".try_eval", generateJsonEval(true)), }, } for k, v := range stdjson.Module.Members { @@ -139,119 +139,102 @@ func tryIndent(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tupl return starlark.Tuple{starlark.String(buf.String()), none}, nil } -// jsonpath performs a JSONPath query on the given JSON data and returns the matching elements. -// It accepts a data object (Starlark value) and a JSONPath expression string. -func jsonPath(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { - return executeJsonPath(thread, fn, args, kwargs, false) -} - -// tryJsonPath performs a JSONPath query on the given JSON data and returns the matching elements, along with any error occurred. -func tryJsonPath(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { - return executeJsonPath(thread, fn, args, kwargs, true) -} +// generateJsonPath generates a Starlark function that performs a JSONPath query on the given JSON data and returns the matching elements. +func generateJsonPath(try bool) itn.StarlarkFunc { + return func(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { + var ( + data starlark.Value + pathExpr string + ) + if err := starlark.UnpackArgs(fn.Name(), args, kwargs, "data", &data, "path", &pathExpr); err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, err + } -// executeJsonPath executes a JSONPath query and returns the results or an error tuple based on the try flag. -func executeJsonPath(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple, try bool) (starlark.Value, error) { - var ( - data starlark.Value - pathExpr string - ) - if err := starlark.UnpackArgs(fn.Name(), args, kwargs, "data", &data, "path", &pathExpr); err != nil { - if try { - return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + jb, err := getJsonBytes(data) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.path: %w", err) } - return none, err - } - jb, err := getJsonBytes(data) - if err != nil { - if try { - return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + nodes, err := ajson.JSONPath(jb, pathExpr) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.path: %w", err) } - return none, fmt.Errorf("json.path: %w", err) - } - nodes, err := ajson.JSONPath(jb, pathExpr) - if err != nil { - if try { - return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + results, err := ajsonNodesToStarlarkList(nodes) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.path: %w", err) } - return none, fmt.Errorf("json.path: %w", err) - } - results, err := ajsonNodesToStarlarkList(nodes) - if err != nil { if try { - return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + return starlark.Tuple{results, starlark.None}, nil } - return none, fmt.Errorf("json.path: %w", err) - } - - if try { - return starlark.Tuple{results, starlark.None}, nil + return results, nil } - return results, nil } -// jsonEval evaluates a JSONPath query with an expression on the given JSON data and returns the evaluation result. -func jsonEval(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { - return executeJsonEval(thread, fn, args, kwargs, false) -} - -// tryJsonEval evaluates a JSONPath query with an expression on the given JSON data and returns the evaluation result, along with any error occurred. -func tryJsonEval(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { - return executeJsonEval(thread, fn, args, kwargs, true) -} +// generateJsonEval generates a Starlark function that evaluates a JSONPath query with an expression on the given JSON data and returns the evaluation result. +func generateJsonEval(try bool) itn.StarlarkFunc { + return func(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { + var ( + data starlark.Value + expr string + ) + if err := starlark.UnpackArgs(fn.Name(), args, kwargs, "data", &data, "expr", &expr); err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, err + } -// executeJsonEval executes a JSONPath evaluation and returns the result or an error tuple based on the try flag. -func executeJsonEval(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple, try bool) (starlark.Value, error) { - var ( - data starlark.Value - expr string - ) - if err := starlark.UnpackArgs(fn.Name(), args, kwargs, "data", &data, "expr", &expr); err != nil { - if try { - return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + jb, err := getJsonBytes(data) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.eval: %w", err) } - return none, err - } - jb, err := getJsonBytes(data) - if err != nil { - if try { - return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + root, err := ajson.Unmarshal(jb) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.eval: %w", err) } - return none, fmt.Errorf("json.eval: %w", err) - } - root, err := ajson.Unmarshal(jb) - if err != nil { - if try { - return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + result, err := ajson.Eval(root, expr) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.eval: %w", err) } - return none, fmt.Errorf("json.eval: %w", err) - } - result, err := ajson.Eval(root, expr) - if err != nil { - if try { - return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + val, err := ajsonNodeToStarlarkValue(result) + if err != nil { + if try { + return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + } + return none, fmt.Errorf("json.eval: %w", err) } - return none, fmt.Errorf("json.eval: %w", err) - } - val, err := ajsonNodeToStarlarkValue(result) - if err != nil { if try { - return starlark.Tuple{starlark.None, starlark.String(err.Error())}, nil + return starlark.Tuple{val, starlark.None}, nil } - return none, fmt.Errorf("json.eval: %w", err) - } - - if try { - return starlark.Tuple{val, starlark.None}, nil + return val, nil } - return val, nil } // getJsonBytes converts a Starlark value to a JSON byte slice. From a9c77c4baca026c73a506f958916c80100876284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 15:56:50 +0800 Subject: [PATCH 04/17] draft tests --- lib/json/json_test.go | 126 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/lib/json/json_test.go b/lib/json/json_test.go index 924179a6..774d4129 100644 --- a/lib/json/json_test.go +++ b/lib/json/json_test.go @@ -358,3 +358,129 @@ func TestLoadModule_JSON(t *testing.T) { }) } } + +func TestJSONPathAndEvalFunctions(t *testing.T) { + const jsonData = ` + { + "store": { + "book": [ + { "category": "reference", "author": "Nigel Rees", "title": "Sayings of the Century", "price": 8.95 }, + { "category": "fiction", "author": "Evelyn Waugh", "title": "Sword of Honour", "price": 12.99 }, + { "category": "fiction", "author": "Herman Melville", "title": "Moby Dick", "isbn": "0-553-21311-3", "price": 8.99 }, + { "category": "fiction", "author": "J. R. R. Tolkien", "title": "The Lord of the Rings", "isbn": "0-395-19395-8", "price": 22.99 } + ], + "bicycle": { "color": "red", "price": 19.95 } + } + }` + + tests := []struct { + name string + script string + want string + wantErr string + }{ + { + name: "json.path - retrieve all prices", + script: itn.HereDoc(` + load('json', 'path') + data = '''` + jsonData + `''' + result = path(data, '$..price') + assert.eq(result, [19.95, 8.95, 12.99, 8.99, 22.99]) + `), + }, + { + name: "json.path - retrieve all book titles", + script: itn.HereDoc(` + load('json', 'path') + data = '''` + jsonData + `''' + result = path(data, '$.store.book[*].title') + assert.eq(result, ['Sayings of the Century', 'Sword of Honour', 'Moby Dick', 'The Lord of the Rings']) + `), + }, + { + name: "json.path - retrieve non-existent path", + script: itn.HereDoc(` + load('json', 'path') + data = '''` + jsonData + `''' + result = path(data, '$.store.nonexistent') + assert.eq(result, []) + `), + }, + { + name: "json.eval - average price of all items", + script: itn.HereDoc(` + load('json', 'eval') + data = '''` + jsonData + `''' + result = eval(data, 'avg($..price)') + assert.eq(result, 14.774) + `), + }, + { + name: "json.eval - sum of all book prices", + script: itn.HereDoc(` + load('json', 'eval') + data = '''` + jsonData + `''' + result = eval(data, 'sum($.store.book[*].price)') + assert.eq(result, 53.92) + `), + }, + { + name: "json.eval - invalid expression", + script: itn.HereDoc(` + load('json', 'eval') + data = '''` + jsonData + `''' + eval(data, 'invalid($..price)') + `), + wantErr: "json.eval: wrong request: wrong formula, 'invalid' is not a function", + }, + { + name: "json.try_path - retrieve all prices", + script: itn.HereDoc(` + load('json', 'try_path') + data = '''` + jsonData + `''' + result, err = try_path(data, '$..price') + assert.eq(result, [19.95, 8.95, 12.99, 8.99, 22.99]) + assert.eq(err, None) + `), + }, + { + name: "json.try_path - invalid JSONPath", + script: itn.HereDoc(` + load('json', 'try_path') + data = '''` + jsonData + `''' + result, err = try_path(data, '$..[invalid]') + assert.eq(result, []) + assert.true('unknown binary op' in err) + `), + }, + { + name: "json.try_eval - average price of all items", + script: itn.HereDoc(` + load('json', 'try_eval') + data = '''` + jsonData + `''' + result, err = try_eval(data, 'avg($..price)') + assert.eq(result, 14.974) + assert.eq(err, None) + `), + }, + { + name: "json.try_eval - invalid expression", + script: itn.HereDoc(` + load('json', 'try_eval') + data = '''` + jsonData + `''' + result, err = try_eval(data, 'invalid($..price)') + assert.eq(result, None) + assert.true('unsupported function: invalid' in err) + `), + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + res, err := itn.ExecModuleWithErrorTest(t, json.ModuleName, json.LoadModule, tt.script, tt.wantErr, nil) + if (err != nil) != (tt.wantErr != "") { + t.Errorf("json(%q) expects error = '%v', actual error = '%v', result = %v", tt.name, tt.wantErr, err, res) + return + } + }) + } +} From 8a606e891c0b2045b95c21cad72fbc9cd4d1b977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 16:07:27 +0800 Subject: [PATCH 05/17] nice --- lib/json/json_test.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/json/json_test.go b/lib/json/json_test.go index 774d4129..3e973dc3 100644 --- a/lib/json/json_test.go +++ b/lib/json/json_test.go @@ -450,7 +450,17 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { data = '''` + jsonData + `''' result, err = try_path(data, '$..[invalid]') assert.eq(result, []) - assert.true('unknown binary op' in err) + assert.eq(err, None) + `), + }, + { + name: "json.try_path - wrong JSONPath", + script: itn.HereDoc(` + load('json', 'try_path') + data = '''` + jsonData + `''' + result, err = try_path(data, '$..[invalid]X') + assert.eq(result, None) + assert.true("wrong symbol 'X' at 12" in err) `), }, { @@ -459,7 +469,7 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { load('json', 'try_eval') data = '''` + jsonData + `''' result, err = try_eval(data, 'avg($..price)') - assert.eq(result, 14.974) + assert.eq(result, 14.774) assert.eq(err, None) `), }, @@ -470,7 +480,7 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { data = '''` + jsonData + `''' result, err = try_eval(data, 'invalid($..price)') assert.eq(result, None) - assert.true('unsupported function: invalid' in err) + assert.true("wrong request: wrong formula, 'invalid' is not a function" in err) `), }, } From d9d5bdcb8077c1a2e527c1214d2e881b9adf97b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 19:44:19 +0800 Subject: [PATCH 06/17] fix cases --- lib/json/json_test.go | 246 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) diff --git a/lib/json/json_test.go b/lib/json/json_test.go index 3e973dc3..b3ea61e6 100644 --- a/lib/json/json_test.go +++ b/lib/json/json_test.go @@ -379,6 +379,12 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { want string wantErr string }{ + { + name: `stdlib can be loaded`, + script: itn.HereDoc(` + load('json', 'path', 'try_path', 'eval', 'try_eval') + `), + }, { name: "json.path - retrieve all prices", script: itn.HereDoc(` @@ -483,6 +489,246 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { assert.true("wrong request: wrong formula, 'invalid' is not a function" in err) `), }, + { + name: "json.path - invalid JSON data", + script: itn.HereDoc(` + load('json', 'path') + data = 'invalid json data' + path(data, '$..price') + `), + wantErr: "json.path: wrong symbol 'i' at 0", + }, + { + name: "json.path - data as starlark dict", + script: itn.HereDoc(` + load('json', 'path') + data = { + "a": [1, 2, {"b": 3}], + "c": {"d": 4} + } + result = path(data, '$..b') + assert.eq(result, [3]) + `), + }, + { + name: "json.path - data as starlark list", + script: itn.HereDoc(` + load('json', 'path') + data = [1, 2, {"a": 3, "b": [4, 5]}] + result = path(data, '$..b') + assert.eq(result, [[4, 5]]) + `), + }, + { + name: "json.path - invalid JSONPath expression", + script: itn.HereDoc(` + load('json', 'path') + data = '''` + jsonData + `''' + path(data, '$..[?(@.price > 10)]X') + `), + wantErr: "json.path: wrong symbol 'X' at 20", + }, + { + name: "json.eval - division by zero", + script: itn.HereDoc(` + load('json', 'eval') + data = '''` + jsonData + `''' + eval(data, '10 / 0') + `), + wantErr: "json.eval: wrong request: division by zero", + }, + { + name: "json.eval - data as starlark dict", + script: itn.HereDoc(` + load('json', 'eval') + data = { + "numbers": [1, 2, 3, 4, 5] + } + result = eval(data, 'sum($.numbers)') + assert.eq(result, 15) + `), + }, + { + name: "json.eval - division with floating point result", + script: itn.HereDoc(` + load('json', 'eval') + data = '''` + jsonData + `''' + result = eval(data, 'sum($..price) / size($..price)') + assert.eq(result, 14.774) + `), + }, + { + name: "json.eval - expression returning boolean", + script: itn.HereDoc(` + load('json', 'eval') + data = {'value': 10} + result = eval(data, '$.value > 5') + assert.true(result) + `), + }, + { + name: "json.eval - expression returning string", + script: itn.HereDoc(` + load('json', 'eval') + data = {'greeting': 'Hello', 'name': 'World'} + result = eval(data, '$.greeting + ", " + $.name + "!"') + assert.eq(result, 'Hello, World!') + `), + }, + { + name: "json.eval - nested JSONPath in expression", + script: itn.HereDoc(` + load('json', 'eval') + data = {'nums': [1, 2, 3, 4, 5]} + result = eval(data, 'sum($.nums[0:3])') + assert.eq(result, 6) + `), + }, + { + name: "json.path - JSON data with multiple types", + script: itn.HereDoc(` + load('json', 'path') + data = { + "string": "text", + "number": 42, + "bool": true, + "null": None, + "array": [1, 2, {'key': 'value'}], + "object": {"nested": {"inner": "value"}} + } + result = path(data, '$..*') + assert.eq(result, ['text', 42, True, None, [1,2,{'key':'value'}], {'nested': {'inner': 'value'}}]) + `), + }, + { + name: "json.path - wildcard and recursive descent", + script: itn.HereDoc(` + load('json', 'path') + data = {'a': {'b': {'c': 1}}, 'd': {'b': {'c': 2}}} + result = path(data, '$..b.c') + assert.eq(result, [1, 2]) + `), + }, + { + name: "json.try_eval - division by zero", + script: itn.HereDoc(` + load('json', 'try_eval') + data = '''` + jsonData + `''' + result, err = try_eval(data, '10 / 0') + assert.eq(result, None) + assert.true("division by zero" in err) + `), + }, + { + name: "json.try_eval - data as invalid type", + script: itn.HereDoc(` + load('json', 'try_eval') + data = lambda x: x + 5 + result, err = try_eval(data, '$ + 5') + assert.eq(result, None) + assert.true("unrecognized starlark" in err) + `), + }, + { + name: "json.eval - accessing non-existent key", + script: itn.HereDoc(` + load('json', 'eval') + data = {'a': 1} + result = eval(data, '$.b') + assert.eq(result, None) + `), + }, + { + name: "json.try_path - data as invalid JSON", + script: itn.HereDoc(` + load('json', 'try_path') + data = '{"invalid": json' + result, err = try_path(data, '$..*') + assert.eq(result, None) + assert.true("wrong symbol 'j' at 12" in err) + `), + }, + { + name: "json.path - array slicing", + script: itn.HereDoc(` + load('json', 'path') + data = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + result = path(data, '$[2:5]') + assert.eq(result, [2,3,4]) + `), + }, + { + name: "json.path - filter expression", + script: itn.HereDoc(` + load('json', 'path') + data = {'items': [{'value': 5}, {'value': 10}, {'value': 15}]} + result = path(data, '$.items[?(@.value > 7)].value') + assert.eq(result, [10, 15]) + `), + }, + { + name: "json.path - parent operator", + script: itn.HereDoc(` + load('json', 'path') + data = {'store': {'book': [{'title': 'A', 'price': 5}, {'title': 'B', 'price': 15}]}} + result = path(data, '$.store.book[?(@.price > 10)]..title') + assert.eq(result, ['B']) + `), + }, + { + name: "json.eval - use of built-in constants", + script: itn.HereDoc(` + load('json', 'eval') + data = {} + result = eval(data, 'pi * 2') + assert.eq(result, 6.283185307179586) + `), + }, + { + name: "json.eval - calling undefined function", + script: itn.HereDoc(` + load('json', 'eval') + data = {} + eval(data, 'undefined_function()') + `), + wantErr: "json.eval: wrong request: wrong formula, 'undefined_function' is not a function", + }, + { + name: "json.eval - invalid syntax in expression", + script: itn.HereDoc(` + load('json', 'eval') + data = {} + eval(data, 'sum(') + `), + wantErr: "json.eval: wrong request: wrong formula, '(' is not an operation or function", + }, + { + name: "json.path - use of '@' current object", + script: itn.HereDoc(` + load('json', 'path') + data = {'items': [{'name': 'A'}, {'name': 'B'}, {'name': 'C'}]} + result = path(data, '$.items[?(@.name == "B")].name') + assert.eq(result, ['B']) + `), + }, + { + name: "json.path - access keys with special characters", + script: itn.HereDoc(` + load('json', 'path') + data = {'weird:key': {'another:weird': 42}} + result = path(data, '$["weird:key"]["another:weird"]') + assert.eq(result, [42]) + `), + }, + { + name: "json.eval - accessing array elements by index", + script: itn.HereDoc(` + load('json', 'eval') + data = {'array': [10, 20, 30]} + result = eval(data, '$.array[1]') + assert.eq(result, 20) + `), + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { From d606533df5fd83d58e4bf0b2b0b9232ee93c5c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 19:45:51 +0800 Subject: [PATCH 07/17] fix ~ --- lib/json/json_test.go | 266 +++++++++++++++++++++--------------------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/lib/json/json_test.go b/lib/json/json_test.go index b3ea61e6..ef92ddca 100644 --- a/lib/json/json_test.go +++ b/lib/json/json_test.go @@ -381,8 +381,8 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { }{ { name: `stdlib can be loaded`, - script: itn.HereDoc(` - load('json', 'path', 'try_path', 'eval', 'try_eval') + script: itn.HereDoc(` + load('json', 'path', 'try_path', 'eval', 'try_eval') `), }, { @@ -491,242 +491,242 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { }, { name: "json.path - invalid JSON data", - script: itn.HereDoc(` - load('json', 'path') - data = 'invalid json data' - path(data, '$..price') + script: itn.HereDoc(` + load('json', 'path') + data = 'invalid json data' + path(data, '$..price') `), wantErr: "json.path: wrong symbol 'i' at 0", }, { name: "json.path - data as starlark dict", - script: itn.HereDoc(` - load('json', 'path') - data = { - "a": [1, 2, {"b": 3}], - "c": {"d": 4} - } - result = path(data, '$..b') - assert.eq(result, [3]) + script: itn.HereDoc(` + load('json', 'path') + data = { + "a": [1, 2, {"b": 3}], + "c": {"d": 4} + } + result = path(data, '$..b') + assert.eq(result, [3]) `), }, { name: "json.path - data as starlark list", - script: itn.HereDoc(` - load('json', 'path') - data = [1, 2, {"a": 3, "b": [4, 5]}] - result = path(data, '$..b') - assert.eq(result, [[4, 5]]) + script: itn.HereDoc(` + load('json', 'path') + data = [1, 2, {"a": 3, "b": [4, 5]}] + result = path(data, '$..b') + assert.eq(result, [[4, 5]]) `), }, { name: "json.path - invalid JSONPath expression", - script: itn.HereDoc(` - load('json', 'path') - data = '''` + jsonData + `''' - path(data, '$..[?(@.price > 10)]X') + script: itn.HereDoc(` + load('json', 'path') + data = '''` + jsonData + `''' + path(data, '$..[?(@.price > 10)]X') `), wantErr: "json.path: wrong symbol 'X' at 20", }, { name: "json.eval - division by zero", - script: itn.HereDoc(` - load('json', 'eval') - data = '''` + jsonData + `''' - eval(data, '10 / 0') + script: itn.HereDoc(` + load('json', 'eval') + data = '''` + jsonData + `''' + eval(data, '10 / 0') `), wantErr: "json.eval: wrong request: division by zero", }, { name: "json.eval - data as starlark dict", - script: itn.HereDoc(` - load('json', 'eval') - data = { - "numbers": [1, 2, 3, 4, 5] - } - result = eval(data, 'sum($.numbers)') - assert.eq(result, 15) + script: itn.HereDoc(` + load('json', 'eval') + data = { + "numbers": [1, 2, 3, 4, 5] + } + result = eval(data, 'sum($.numbers)') + assert.eq(result, 15) `), }, { name: "json.eval - division with floating point result", - script: itn.HereDoc(` - load('json', 'eval') - data = '''` + jsonData + `''' - result = eval(data, 'sum($..price) / size($..price)') - assert.eq(result, 14.774) + script: itn.HereDoc(` + load('json', 'eval') + data = '''` + jsonData + `''' + result = eval(data, 'sum($..price) / size($..price)') + assert.eq(result, 14.774) `), }, { name: "json.eval - expression returning boolean", - script: itn.HereDoc(` - load('json', 'eval') - data = {'value': 10} - result = eval(data, '$.value > 5') + script: itn.HereDoc(` + load('json', 'eval') + data = {'value': 10} + result = eval(data, '$.value > 5') assert.true(result) `), }, { name: "json.eval - expression returning string", - script: itn.HereDoc(` - load('json', 'eval') - data = {'greeting': 'Hello', 'name': 'World'} - result = eval(data, '$.greeting + ", " + $.name + "!"') - assert.eq(result, 'Hello, World!') + script: itn.HereDoc(` + load('json', 'eval') + data = {'greeting': 'Hello', 'name': 'World'} + result = eval(data, '$.greeting + ", " + $.name + "!"') + assert.eq(result, 'Hello, World!') `), }, { name: "json.eval - nested JSONPath in expression", - script: itn.HereDoc(` - load('json', 'eval') - data = {'nums': [1, 2, 3, 4, 5]} - result = eval(data, 'sum($.nums[0:3])') - assert.eq(result, 6) + script: itn.HereDoc(` + load('json', 'eval') + data = {'nums': [1, 2, 3, 4, 5]} + result = eval(data, 'sum($.nums[0:3])') + assert.eq(result, 6) `), }, { name: "json.path - JSON data with multiple types", - script: itn.HereDoc(` - load('json', 'path') - data = { - "string": "text", - "number": 42, - "bool": true, - "null": None, - "array": [1, 2, {'key': 'value'}], - "object": {"nested": {"inner": "value"}} - } - result = path(data, '$..*') - assert.eq(result, ['text', 42, True, None, [1,2,{'key':'value'}], {'nested': {'inner': 'value'}}]) + script: itn.HereDoc(` + load('json', 'path') + data = { + "string": "text", + "number": 42, + "bool": True, + "null": None, + "array": [1, 2, {'key': 'value'}], + "object": {"nested": {"inner": "value"}} + } + result = path(data, '$..*') + assert.eq(result, [[1, 2, {"key": "value"}],True,None,42,{"nested": {"inner": "value"}},"text",1,2,{"key": "value"},{"inner": "value"},"value","value"]) `), }, { name: "json.path - wildcard and recursive descent", - script: itn.HereDoc(` - load('json', 'path') - data = {'a': {'b': {'c': 1}}, 'd': {'b': {'c': 2}}} - result = path(data, '$..b.c') - assert.eq(result, [1, 2]) + script: itn.HereDoc(` + load('json', 'path') + data = {'a': {'b': {'c': 1}}, 'd': {'b': {'c': 2}}} + result = path(data, '$..b.c') + assert.eq(result, [1, 2]) `), }, { name: "json.try_eval - division by zero", - script: itn.HereDoc(` - load('json', 'try_eval') - data = '''` + jsonData + `''' - result, err = try_eval(data, '10 / 0') - assert.eq(result, None) - assert.true("division by zero" in err) + script: itn.HereDoc(` + load('json', 'try_eval') + data = '''` + jsonData + `''' + result, err = try_eval(data, '10 / 0') + assert.eq(result, None) + assert.true("division by zero" in err) `), }, { name: "json.try_eval - data as invalid type", - script: itn.HereDoc(` - load('json', 'try_eval') - data = lambda x: x + 5 + script: itn.HereDoc(` + load('json', 'try_eval') + data = lambda x: x + 5 result, err = try_eval(data, '$ + 5') - assert.eq(result, None) - assert.true("unrecognized starlark" in err) + assert.eq(result, None) + assert.true("unrecognized starlark" in err) `), }, { name: "json.eval - accessing non-existent key", - script: itn.HereDoc(` - load('json', 'eval') - data = {'a': 1} + script: itn.HereDoc(` + load('json', 'eval') + data = {'a': 1} result = eval(data, '$.b') - assert.eq(result, None) + assert.eq(result, None) `), }, { name: "json.try_path - data as invalid JSON", - script: itn.HereDoc(` - load('json', 'try_path') - data = '{"invalid": json' - result, err = try_path(data, '$..*') - assert.eq(result, None) - assert.true("wrong symbol 'j' at 12" in err) + script: itn.HereDoc(` + load('json', 'try_path') + data = '{"invalid": json' + result, err = try_path(data, '$..*') + assert.eq(result, None) + assert.true("wrong symbol 'j' at 12" in err) `), }, { name: "json.path - array slicing", - script: itn.HereDoc(` - load('json', 'path') - data = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - result = path(data, '$[2:5]') - assert.eq(result, [2,3,4]) + script: itn.HereDoc(` + load('json', 'path') + data = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + result = path(data, '$[2:5]') + assert.eq(result, [2,3,4]) `), }, { name: "json.path - filter expression", - script: itn.HereDoc(` - load('json', 'path') - data = {'items': [{'value': 5}, {'value': 10}, {'value': 15}]} - result = path(data, '$.items[?(@.value > 7)].value') - assert.eq(result, [10, 15]) + script: itn.HereDoc(` + load('json', 'path') + data = {'items': [{'value': 5}, {'value': 10}, {'value': 15}]} + result = path(data, '$.items[?(@.value > 7)].value') + assert.eq(result, [10, 15]) `), }, { name: "json.path - parent operator", - script: itn.HereDoc(` - load('json', 'path') - data = {'store': {'book': [{'title': 'A', 'price': 5}, {'title': 'B', 'price': 15}]}} - result = path(data, '$.store.book[?(@.price > 10)]..title') - assert.eq(result, ['B']) + script: itn.HereDoc(` + load('json', 'path') + data = {'store': {'book': [{'title': 'A', 'price': 5}, {'title': 'B', 'price': 15}]}} + result = path(data, '$.store.book[?(@.price > 10)]..title') + assert.eq(result, ['B']) `), }, { name: "json.eval - use of built-in constants", - script: itn.HereDoc(` - load('json', 'eval') - data = {} - result = eval(data, 'pi * 2') - assert.eq(result, 6.283185307179586) + script: itn.HereDoc(` + load('json', 'eval') + data = {} + result = eval(data, 'pi * 2') + assert.eq(result, 6.283185307179586) `), }, { name: "json.eval - calling undefined function", - script: itn.HereDoc(` - load('json', 'eval') - data = {} - eval(data, 'undefined_function()') + script: itn.HereDoc(` + load('json', 'eval') + data = {} + eval(data, 'undefined_function()') `), wantErr: "json.eval: wrong request: wrong formula, 'undefined_function' is not a function", }, { name: "json.eval - invalid syntax in expression", - script: itn.HereDoc(` - load('json', 'eval') - data = {} + script: itn.HereDoc(` + load('json', 'eval') + data = {} eval(data, 'sum(') `), wantErr: "json.eval: wrong request: wrong formula, '(' is not an operation or function", }, { name: "json.path - use of '@' current object", - script: itn.HereDoc(` - load('json', 'path') - data = {'items': [{'name': 'A'}, {'name': 'B'}, {'name': 'C'}]} - result = path(data, '$.items[?(@.name == "B")].name') - assert.eq(result, ['B']) + script: itn.HereDoc(` + load('json', 'path') + data = {'items': [{'name': 'A'}, {'name': 'B'}, {'name': 'C'}]} + result = path(data, '$.items[?(@.name == "B")].name') + assert.eq(result, ['B']) `), }, { name: "json.path - access keys with special characters", - script: itn.HereDoc(` - load('json', 'path') - data = {'weird:key': {'another:weird': 42}} - result = path(data, '$["weird:key"]["another:weird"]') - assert.eq(result, [42]) + script: itn.HereDoc(` + load('json', 'path') + data = {'weird:key': {'another:weird': 42}} + result = path(data, '$["weird:key"]["another:weird"]') + assert.eq(result, [42]) `), }, { name: "json.eval - accessing array elements by index", - script: itn.HereDoc(` - load('json', 'eval') - data = {'array': [10, 20, 30]} - result = eval(data, '$.array[1]') - assert.eq(result, 20) + script: itn.HereDoc(` + load('json', 'eval') + data = {'array': [10, 20, 30]} + result = eval(data, '$.array[1]') + assert.eq(result, 20) `), }, } From baa43f86b0e4ff13521bd83f9b07da23db50e8ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 20:35:48 +0800 Subject: [PATCH 08/17] new ordrer --- lib/json/json_test.go | 336 ++++++++++++++++++++++++------------------ 1 file changed, 191 insertions(+), 145 deletions(-) diff --git a/lib/json/json_test.go b/lib/json/json_test.go index ef92ddca..c796efa7 100644 --- a/lib/json/json_test.go +++ b/lib/json/json_test.go @@ -385,6 +385,17 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { load('json', 'path', 'try_path', 'eval', 'try_eval') `), }, + + // path + { + name: "json.path - missing path", + script: itn.HereDoc(` + load('json', 'path') + data = '''` + jsonData + `''' + result = path(data) + `), + wantErr: `json.path: missing argument for path`, + }, { name: "json.path - retrieve all prices", script: itn.HereDoc(` @@ -413,120 +424,151 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { `), }, { - name: "json.eval - average price of all items", + name: "json.path - invalid JSON data", script: itn.HereDoc(` - load('json', 'eval') - data = '''` + jsonData + `''' - result = eval(data, 'avg($..price)') - assert.eq(result, 14.774) + load('json', 'path') + data = 'invalid json data' + path(data, '$..price') `), + wantErr: "json.path: wrong symbol 'i' at 0", }, { - name: "json.eval - sum of all book prices", + name: "json.path - data as starlark dict", script: itn.HereDoc(` - load('json', 'eval') - data = '''` + jsonData + `''' - result = eval(data, 'sum($.store.book[*].price)') - assert.eq(result, 53.92) + load('json', 'path') + data = { + "a": [1, 2, {"b": 3}], + "c": {"d": 4} + } + result = path(data, '$..b') + assert.eq(result, [3]) `), }, { - name: "json.eval - invalid expression", + name: "json.path - data as starlark list", script: itn.HereDoc(` - load('json', 'eval') - data = '''` + jsonData + `''' - eval(data, 'invalid($..price)') + load('json', 'path') + data = [1, 2, {"a": 3, "b": [4, 5]}] + result = path(data, '$..b') + assert.eq(result, [[4, 5]]) `), - wantErr: "json.eval: wrong request: wrong formula, 'invalid' is not a function", }, { - name: "json.try_path - retrieve all prices", + name: "json.path - invalid JSONPath expression", script: itn.HereDoc(` - load('json', 'try_path') + load('json', 'path') data = '''` + jsonData + `''' - result, err = try_path(data, '$..price') - assert.eq(result, [19.95, 8.95, 12.99, 8.99, 22.99]) - assert.eq(err, None) + path(data, '$..[?(@.price > 10)]X') `), + wantErr: "json.path: wrong symbol 'X' at 20", }, { - name: "json.try_path - invalid JSONPath", + name: "json.path - JSON data with multiple types", script: itn.HereDoc(` - load('json', 'try_path') - data = '''` + jsonData + `''' - result, err = try_path(data, '$..[invalid]') - assert.eq(result, []) - assert.eq(err, None) + load('json', 'path') + data = { + "string": "text", + "number": 42, + "bool": True, + "null": None, + "array": [1, 2, {'key': 'value'}], + "object": {"nested": {"inner": "value"}} + } + result = path(data, '$..*') + assert.eq(result, [[1, 2, {"key": "value"}],True,None,42,{"nested": {"inner": "value"}},"text",1,2,{"key": "value"},{"inner": "value"},"value","value"]) `), }, { - name: "json.try_path - wrong JSONPath", + name: "json.path - wildcard and recursive descent", script: itn.HereDoc(` - load('json', 'try_path') - data = '''` + jsonData + `''' - result, err = try_path(data, '$..[invalid]X') - assert.eq(result, None) - assert.true("wrong symbol 'X' at 12" in err) + load('json', 'path') + data = {'a': {'b': {'c': 1}}, 'd': {'b': {'c': 2}}} + result = path(data, '$..b.c') + assert.eq(result, [1, 2]) `), }, { - name: "json.try_eval - average price of all items", + name: "json.path - array slicing", script: itn.HereDoc(` - load('json', 'try_eval') - data = '''` + jsonData + `''' - result, err = try_eval(data, 'avg($..price)') - assert.eq(result, 14.774) - assert.eq(err, None) + load('json', 'path') + data = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + result = path(data, '$[2:5]') + assert.eq(result, [2,3,4]) `), }, { - name: "json.try_eval - invalid expression", + name: "json.path - filter expression", script: itn.HereDoc(` - load('json', 'try_eval') - data = '''` + jsonData + `''' - result, err = try_eval(data, 'invalid($..price)') - assert.eq(result, None) - assert.true("wrong request: wrong formula, 'invalid' is not a function" in err) + load('json', 'path') + data = {'items': [{'value': 5}, {'value': 10}, {'value': 15}]} + result = path(data, '$.items[?(@.value > 7)].value') + assert.eq(result, [10, 15]) `), }, { - name: "json.path - invalid JSON data", + name: "json.path - parent operator", script: itn.HereDoc(` load('json', 'path') - data = 'invalid json data' - path(data, '$..price') + data = {'store': {'book': [{'title': 'A', 'price': 5}, {'title': 'B', 'price': 15}]}} + result = path(data, '$.store.book[?(@.price > 10)]..title') + assert.eq(result, ['B']) `), - wantErr: "json.path: wrong symbol 'i' at 0", }, { - name: "json.path - data as starlark dict", + name: "json.path - use of '@' current object", script: itn.HereDoc(` load('json', 'path') - data = { - "a": [1, 2, {"b": 3}], - "c": {"d": 4} - } - result = path(data, '$..b') - assert.eq(result, [3]) + data = {'items': [{'name': 'A'}, {'name': 'B'}, {'name': 'C'}]} + result = path(data, '$.items[?(@.name == "B")].name') + assert.eq(result, ['B']) `), }, { - name: "json.path - data as starlark list", + name: "json.path - access keys with special characters", script: itn.HereDoc(` load('json', 'path') - data = [1, 2, {"a": 3, "b": [4, 5]}] - result = path(data, '$..b') - assert.eq(result, [[4, 5]]) + data = {'weird:key': {'another:weird': 42}} + result = path(data, '$["weird:key"]["another:weird"]') + assert.eq(result, [42]) `), }, + + // eval { - name: "json.path - invalid JSONPath expression", + name: "json.eval - missing expr", script: itn.HereDoc(` - load('json', 'path') + load('json', 'eval') data = '''` + jsonData + `''' - path(data, '$..[?(@.price > 10)]X') + result = eval(data) `), - wantErr: "json.path: wrong symbol 'X' at 20", + wantErr: `json.eval: missing argument for expr`, + }, + { + name: "json.eval - average price of all items", + script: itn.HereDoc(` + load('json', 'eval') + data = '''` + jsonData + `''' + result = eval(data, 'avg($..price)') + assert.eq(result, 14.774) + `), + }, + { + name: "json.eval - sum of all book prices", + script: itn.HereDoc(` + load('json', 'eval') + data = '''` + jsonData + `''' + result = eval(data, 'sum($.store.book[*].price)') + assert.eq(result, 53.92) + `), + }, + { + name: "json.eval - invalid expression", + script: itn.HereDoc(` + load('json', 'eval') + data = '''` + jsonData + `''' + eval(data, 'invalid($..price)') + `), + wantErr: "json.eval: wrong request: wrong formula, 'invalid' is not a function", }, { name: "json.eval - division by zero", @@ -585,148 +627,152 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { `), }, { - name: "json.path - JSON data with multiple types", + name: "json.eval - accessing non-existent key", script: itn.HereDoc(` - load('json', 'path') - data = { - "string": "text", - "number": 42, - "bool": True, - "null": None, - "array": [1, 2, {'key': 'value'}], - "object": {"nested": {"inner": "value"}} - } - result = path(data, '$..*') - assert.eq(result, [[1, 2, {"key": "value"}],True,None,42,{"nested": {"inner": "value"}},"text",1,2,{"key": "value"},{"inner": "value"},"value","value"]) + load('json', 'eval') + data = {'a': 1} + result = eval(data, '$.b') + assert.eq(result, None) `), }, { - name: "json.path - wildcard and recursive descent", + name: "json.eval - use of built-in constants", script: itn.HereDoc(` - load('json', 'path') - data = {'a': {'b': {'c': 1}}, 'd': {'b': {'c': 2}}} - result = path(data, '$..b.c') - assert.eq(result, [1, 2]) + load('json', 'eval') + data = {} + result = eval(data, 'pi * 2') + assert.eq(result, 6.283185307179586) `), }, { - name: "json.try_eval - division by zero", + name: "json.eval - calling undefined function", script: itn.HereDoc(` - load('json', 'try_eval') - data = '''` + jsonData + `''' - result, err = try_eval(data, '10 / 0') - assert.eq(result, None) - assert.true("division by zero" in err) + load('json', 'eval') + data = {} + eval(data, 'undefined_function()') `), + wantErr: "json.eval: wrong request: wrong formula, 'undefined_function' is not a function", }, { - name: "json.try_eval - data as invalid type", + name: "json.eval - invalid syntax in expression", script: itn.HereDoc(` - load('json', 'try_eval') - data = lambda x: x + 5 - result, err = try_eval(data, '$ + 5') - assert.eq(result, None) - assert.true("unrecognized starlark" in err) + load('json', 'eval') + data = {} + eval(data, 'sum(') `), + wantErr: "json.eval: wrong request: wrong formula, '(' is not an operation or function", }, { - name: "json.eval - accessing non-existent key", + name: "json.eval - accessing array elements by index", script: itn.HereDoc(` load('json', 'eval') - data = {'a': 1} - result = eval(data, '$.b') - assert.eq(result, None) + data = {'array': [10, 20, 30]} + result = eval(data, '$.array[1]') + assert.eq(result, 20) `), }, + + // try path { - name: "json.try_path - data as invalid JSON", + name: "json.try_path - missing path", script: itn.HereDoc(` load('json', 'try_path') - data = '{"invalid": json' - result, err = try_path(data, '$..*') + data = '''` + jsonData + `''' + result, err = try_path(data) assert.eq(result, None) - assert.true("wrong symbol 'j' at 12" in err) + assert.true('json.try_path: missing argument for path' in err) `), }, { - name: "json.path - array slicing", + name: "json.try_path - retrieve all prices", script: itn.HereDoc(` - load('json', 'path') - data = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - result = path(data, '$[2:5]') - assert.eq(result, [2,3,4]) + load('json', 'try_path') + data = '''` + jsonData + `''' + result, err = try_path(data, '$..price') + assert.eq(result, [19.95, 8.95, 12.99, 8.99, 22.99]) + assert.eq(err, None) `), }, { - name: "json.path - filter expression", + name: "json.try_path - invalid JSONPath", script: itn.HereDoc(` - load('json', 'path') - data = {'items': [{'value': 5}, {'value': 10}, {'value': 15}]} - result = path(data, '$.items[?(@.value > 7)].value') - assert.eq(result, [10, 15]) + load('json', 'try_path') + data = '''` + jsonData + `''' + result, err = try_path(data, '$..[invalid]') + assert.eq(result, []) + assert.eq(err, None) `), }, { - name: "json.path - parent operator", + name: "json.try_path - wrong JSONPath", script: itn.HereDoc(` - load('json', 'path') - data = {'store': {'book': [{'title': 'A', 'price': 5}, {'title': 'B', 'price': 15}]}} - result = path(data, '$.store.book[?(@.price > 10)]..title') - assert.eq(result, ['B']) + load('json', 'try_path') + data = '''` + jsonData + `''' + result, err = try_path(data, '$..[invalid]X') + assert.eq(result, None) + assert.true("wrong symbol 'X' at 12" in err) `), }, { - name: "json.eval - use of built-in constants", + name: "json.try_path - data as invalid JSON", script: itn.HereDoc(` - load('json', 'eval') - data = {} - result = eval(data, 'pi * 2') - assert.eq(result, 6.283185307179586) + load('json', 'try_path') + data = '{"invalid": json' + result, err = try_path(data, '$..*') + assert.eq(result, None) + assert.true("wrong symbol 'j' at 12" in err) `), }, + + // try eval { - name: "json.eval - calling undefined function", + name: "json.try_eval - average price of all items", script: itn.HereDoc(` - load('json', 'eval') - data = {} - eval(data, 'undefined_function()') + load('json', 'try_eval') + data = '''` + jsonData + `''' + result, err = try_eval(data, 'avg($..price)') + assert.eq(result, 14.774) + assert.eq(err, None) `), - wantErr: "json.eval: wrong request: wrong formula, 'undefined_function' is not a function", }, { - name: "json.eval - invalid syntax in expression", + name: "json.try_eval - invalid expression", script: itn.HereDoc(` - load('json', 'eval') - data = {} - eval(data, 'sum(') + load('json', 'try_eval') + data = '''` + jsonData + `''' + result, err = try_eval(data, 'invalid($..price)') + assert.eq(result, None) + assert.true("wrong request: wrong formula, 'invalid' is not a function" in err) `), - wantErr: "json.eval: wrong request: wrong formula, '(' is not an operation or function", }, { - name: "json.path - use of '@' current object", + name: "json.try_eval - missing expr", script: itn.HereDoc(` - load('json', 'path') - data = {'items': [{'name': 'A'}, {'name': 'B'}, {'name': 'C'}]} - result = path(data, '$.items[?(@.name == "B")].name') - assert.eq(result, ['B']) + load('json', 'try_eval') + data = '''` + jsonData + `''' + result, err = try_eval(data) + assert.eq(result, None) + assert.true('json.try_eval: missing argument for expr' in err) `), }, { - name: "json.path - access keys with special characters", + name: "json.try_eval - division by zero", script: itn.HereDoc(` - load('json', 'path') - data = {'weird:key': {'another:weird': 42}} - result = path(data, '$["weird:key"]["another:weird"]') - assert.eq(result, [42]) + load('json', 'try_eval') + data = '''` + jsonData + `''' + result, err = try_eval(data, '10 / 0') + assert.eq(result, None) + assert.true("division by zero" in err) `), }, { - name: "json.eval - accessing array elements by index", + name: "json.try_eval - data as invalid type", script: itn.HereDoc(` - load('json', 'eval') - data = {'array': [10, 20, 30]} - result = eval(data, '$.array[1]') - assert.eq(result, 20) + load('json', 'try_eval') + data = lambda x: x + 5 + result, err = try_eval(data, '$ + 5') + assert.eq(result, None) + assert.true("unrecognized starlark" in err) `), }, } From b03f377f6931a29c1c520208ae08b8bbd15e0b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 20:39:28 +0800 Subject: [PATCH 09/17] new types 2 --- lib/json/json_test.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lib/json/json_test.go b/lib/json/json_test.go index c796efa7..226cd9df 100644 --- a/lib/json/json_test.go +++ b/lib/json/json_test.go @@ -532,6 +532,15 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { assert.eq(result, [42]) `), }, + { + name: "json.path - data as invalid type", + script: itn.HereDoc(` + load('json', 'path') + data = lambda x: x + 5 + path(data, '$ + 5') + `), + wantErr: `json.path: unrecognized starlark type`, + }, // eval { @@ -671,6 +680,15 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { assert.eq(result, 20) `), }, + { + name: "json.eval - data as invalid type", + script: itn.HereDoc(` + load('json', 'eval') + data = lambda x: x + 5 + eval(data, '$ + 5') + `), + wantErr: `json.eval: unrecognized starlark type`, + }, // try path { @@ -723,6 +741,16 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { assert.true("wrong symbol 'j' at 12" in err) `), }, + { + name: "json.try_path - data as invalid type", + script: itn.HereDoc(` + load('json', 'try_path') + data = lambda x: x + 5 + result, err = try_path(data, '$ + 5') + assert.eq(result, None) + assert.true("unrecognized starlark" in err) + `), + }, // try eval { From fef2d68401e521326ad44875ab62b8247bdb4123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 20:42:47 +0800 Subject: [PATCH 10/17] for int as key --- lib/json/json_test.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lib/json/json_test.go b/lib/json/json_test.go index 226cd9df..6eb3dd3a 100644 --- a/lib/json/json_test.go +++ b/lib/json/json_test.go @@ -541,6 +541,17 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { `), wantErr: `json.path: unrecognized starlark type`, }, + { + name: "json.path - int as key", + script: itn.HereDoc(` + load('json', 'path') + data = { + 42: {"a": 100} + } + result = path(data, '$.42.a') + assert.eq(result, [100]) + `), + }, // eval { @@ -689,6 +700,17 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { `), wantErr: `json.eval: unrecognized starlark type`, }, + { + name: "json.eval - int as key", + script: itn.HereDoc(` + load('json', 'eval') + data = { + 42: {"a": 100} + } + result = eval(data, '$.42.a') + assert.eq(result, 100) + `), + }, // try path { From d5f6206e8a3de636d3e91433f0497907c6be68fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 13 Nov 2024 20:50:54 +0800 Subject: [PATCH 11/17] for cases --- lib/json/json_test.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/json/json_test.go b/lib/json/json_test.go index 6eb3dd3a..80403286 100644 --- a/lib/json/json_test.go +++ b/lib/json/json_test.go @@ -410,7 +410,7 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { script: itn.HereDoc(` load('json', 'path') data = '''` + jsonData + `''' - result = path(data, '$.store.book[*].title') + result = path(bytes(data), '$.store.book[*].title') assert.eq(result, ['Sayings of the Century', 'Sword of Honour', 'Moby Dick', 'The Lord of the Rings']) `), }, @@ -682,6 +682,14 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { `), wantErr: "json.eval: wrong request: wrong formula, '(' is not an operation or function", }, + { + name: "json.eval - invalid data", + script: itn.HereDoc(` + load('json', 'eval') + eval('{"a": 123', '$ + 5') + `), + wantErr: "json.eval: unexpected end of file", + }, { name: "json.eval - accessing array elements by index", script: itn.HereDoc(` From d38d9884bf68a0b58ab398ea2f59bea2167f9463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Thu, 14 Nov 2024 14:38:21 +0800 Subject: [PATCH 12/17] for eval panic --- lib/json/json.go | 20 ++++++++++++++++++-- lib/json/json_test.go | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/lib/json/json.go b/lib/json/json.go index 344264b2..25190e51 100644 --- a/lib/json/json.go +++ b/lib/json/json.go @@ -141,7 +141,7 @@ func tryIndent(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tupl // generateJsonPath generates a Starlark function that performs a JSONPath query on the given JSON data and returns the matching elements. func generateJsonPath(try bool) itn.StarlarkFunc { - return func(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { + return func(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (res starlark.Value, err error) { var ( data starlark.Value pathExpr string @@ -161,6 +161,14 @@ func generateJsonPath(try bool) itn.StarlarkFunc { return none, fmt.Errorf("json.path: %w", err) } + // HACK: Recover from panic in ajson.Unmarshal and ajson.Eval + defer func() { + if r := recover(); r != nil { + res = none + err = fmt.Errorf("json.path: ajson panic: %v", r) + } + }() + nodes, err := ajson.JSONPath(jb, pathExpr) if err != nil { if try { @@ -186,7 +194,7 @@ func generateJsonPath(try bool) itn.StarlarkFunc { // generateJsonEval generates a Starlark function that evaluates a JSONPath query with an expression on the given JSON data and returns the evaluation result. func generateJsonEval(try bool) itn.StarlarkFunc { - return func(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) { + return func(thread *starlark.Thread, fn *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (res starlark.Value, err error) { var ( data starlark.Value expr string @@ -206,6 +214,14 @@ func generateJsonEval(try bool) itn.StarlarkFunc { return none, fmt.Errorf("json.eval: %w", err) } + // HACK: Recover from panic in ajson.Unmarshal and ajson.Eval + defer func() { + if r := recover(); r != nil { + res = none + err = fmt.Errorf("json.eval: ajson panic: %v", r) + } + }() + root, err := ajson.Unmarshal(jb) if err != nil { if try { diff --git a/lib/json/json_test.go b/lib/json/json_test.go index 80403286..615cc7a0 100644 --- a/lib/json/json_test.go +++ b/lib/json/json_test.go @@ -552,6 +552,17 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { assert.eq(result, [100]) `), }, + { + name: "json.path - broken array expression", + script: itn.HereDoc(` + load('json', 'path') + data = [{"abc": 123}] + result = path(data, '$..length') + assert.eq(result, [1]) + result2 = path(data, '$..$#') + assert.eq(result2, []) + `), + }, // eval { @@ -719,6 +730,17 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { assert.eq(result, 100) `), }, + { + name: "json.eval - broken array expression", + script: itn.HereDoc(` + load('json', 'eval') + data = [{"abc": 123}] + result = eval(data, '$..length') + assert.eq(result, 1) + result2 = eval(data, '$..') + `), + wantErr: `json.eval: ajson panic: runtime error: index out of range [1] with length 1`, + }, // try path { From 870def35cf756c52a85dc80b335f8af4e2edd839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Tue, 10 Dec 2024 14:33:57 +0800 Subject: [PATCH 13/17] for panic repro --- dataconv/marshal_test.go | 5 +++++ lib/json/json.go | 18 +++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dataconv/marshal_test.go b/dataconv/marshal_test.go index 8aac3cc3..5c279178 100644 --- a/dataconv/marshal_test.go +++ b/dataconv/marshal_test.go @@ -154,6 +154,10 @@ func TestUnmarshal(t *testing.T) { if err := cycDict.SetKey(starlark.String("bar"), cycDict); err != nil { t.Fatal(err) } + tupDict := starlark.NewDict(2) + if err := tupDict.SetKey(starlark.Tuple{starlark.String("Aloha"), starlark.MakeInt(100)}, starlark.MakeInt(42)); err != nil { + t.Fatal(err) + } cycList := starlark.NewList([]starlark.Value{starlark.MakeInt(42)}) if err := cycList.Append(cycList); err != nil { @@ -258,6 +262,7 @@ func TestUnmarshal(t *testing.T) { {strDictCT, map[string]interface{}{"foo": 42, "bar": &customType{42}}, ""}, {cycDict, nil, "cyclic reference found"}, {cycList, nil, "cyclic reference found"}, + {tupDict, nil, "cyclic reference found"}, {starlark.NewList([]starlark.Value{starlark.MakeInt(42), ct}), []interface{}{42, &customType{42}}, ""}, {starlark.Tuple{starlark.String("foo"), starlark.MakeInt(42)}, []interface{}{"foo", 42}, ""}, {ss, []interface{}{"Hello", "World"}, ""}, diff --git a/lib/json/json.go b/lib/json/json.go index 25190e51..9142fecd 100644 --- a/lib/json/json.go +++ b/lib/json/json.go @@ -214,13 +214,13 @@ func generateJsonEval(try bool) itn.StarlarkFunc { return none, fmt.Errorf("json.eval: %w", err) } - // HACK: Recover from panic in ajson.Unmarshal and ajson.Eval - defer func() { - if r := recover(); r != nil { - res = none - err = fmt.Errorf("json.eval: ajson panic: %v", r) - } - }() + // // HACK: Recover from panic in ajson.Unmarshal and ajson.Eval + // defer func() { + // if r := recover(); r != nil { + // res = none + // err = fmt.Errorf("json.eval: ajson panic: %v", r) + // } + // }() root, err := ajson.Unmarshal(jb) if err != nil { @@ -304,7 +304,6 @@ func ajsonNodeToStarlarkValue(node *ajson.Node) (starlark.Value, error) { } return dict, nil case ajson.Array: - // Convert JSON array to Starlark list elements, err := node.GetArray() if err != nil { return nil, err @@ -321,13 +320,10 @@ func ajsonNodeToStarlarkValue(node *ajson.Node) (starlark.Value, error) { case ajson.String: return starlark.String(node.MustString()), nil case ajson.Numeric: - // Number value num := node.MustNumeric() if math.Mod(num, 1.0) == 0 { - // Integer value return starlark.MakeInt64(int64(num)), nil } else { - // Float value return starlark.Float(num), nil } case ajson.Bool: From 2b68861c85dd3dbd2ccf5dde137a683af3977030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Tue, 10 Dec 2024 16:03:26 +0800 Subject: [PATCH 14/17] for tests --- lib/json/json.go | 29 ++++++++++++++++++++++++----- lib/json/json_test.go | 12 ++++++++---- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/lib/json/json.go b/lib/json/json.go index 9142fecd..693f6997 100644 --- a/lib/json/json.go +++ b/lib/json/json.go @@ -6,6 +6,8 @@ import ( "encoding/json" "fmt" "math" + "sort" + "strconv" "sync" itn "github.com/1set/starlet/dataconv" @@ -304,12 +306,29 @@ func ajsonNodeToStarlarkValue(node *ajson.Node) (starlark.Value, error) { } return dict, nil case ajson.Array: - elements, err := node.GetArray() - if err != nil { - return nil, err + // Use keys and indices to avoid relying on invalid index pointers + keys := node.Keys() + if len(keys) == 0 { + return starlark.NewList(nil), nil + } + indices := make([]int, len(keys)) + indexMap := make(map[int]*ajson.Node) + for i, key := range keys { + idx, err := strconv.Atoi(key) + if err != nil { + return nil, fmt.Errorf("invalid array index: %v", err) + } + indices[i] = idx + child, err := node.GetIndex(idx) + if err != nil { + return nil, err + } + indexMap[idx] = child } - vals := make([]starlark.Value, len(elements)) - for i, elem := range elements { + sort.Ints(indices) + vals := make([]starlark.Value, len(indices)) + for i, idx := range indices { + elem := indexMap[idx] val, err := ajsonNodeToStarlarkValue(elem) if err != nil { return nil, err diff --git a/lib/json/json_test.go b/lib/json/json_test.go index 615cc7a0..bc45ac05 100644 --- a/lib/json/json_test.go +++ b/lib/json/json_test.go @@ -735,11 +735,15 @@ func TestJSONPathAndEvalFunctions(t *testing.T) { script: itn.HereDoc(` load('json', 'eval') data = [{"abc": 123}] - result = eval(data, '$..length') - assert.eq(result, 1) - result2 = eval(data, '$..') + r0 = eval(data, '$..length') + assert.eq(r0, 1) + r1 = eval(data, '$.') + assert.eq(r1, [{"abc": 123}]) + r2 = eval(data, '$..') + assert.eq(r2, [[{"abc": 123}],{"abc": 123}]) + r3 = eval(data, '$...') + assert.eq(r3, [[{"abc": 123}],{"abc": 123},{"abc": 123}]) `), - wantErr: `json.eval: ajson panic: runtime error: index out of range [1] with length 1`, }, // try path From 0a3051afc12f2d9d492f94e008ff3235d5f3bb0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Tue, 10 Dec 2024 16:04:40 +0800 Subject: [PATCH 15/17] DS --- lib/json/json.go | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/json/json.go b/lib/json/json.go index 693f6997..e1c718a5 100644 --- a/lib/json/json.go +++ b/lib/json/json.go @@ -163,14 +163,6 @@ func generateJsonPath(try bool) itn.StarlarkFunc { return none, fmt.Errorf("json.path: %w", err) } - // HACK: Recover from panic in ajson.Unmarshal and ajson.Eval - defer func() { - if r := recover(); r != nil { - res = none - err = fmt.Errorf("json.path: ajson panic: %v", r) - } - }() - nodes, err := ajson.JSONPath(jb, pathExpr) if err != nil { if try { @@ -216,14 +208,6 @@ func generateJsonEval(try bool) itn.StarlarkFunc { return none, fmt.Errorf("json.eval: %w", err) } - // // HACK: Recover from panic in ajson.Unmarshal and ajson.Eval - // defer func() { - // if r := recover(); r != nil { - // res = none - // err = fmt.Errorf("json.eval: ajson panic: %v", r) - // } - // }() - root, err := ajson.Unmarshal(jb) if err != nil { if try { From 3894d2bccef67d951ba94f7ada90f2eb232db120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Wed, 11 Dec 2024 14:04:42 +0800 Subject: [PATCH 16/17] temp disabled cases --- dataconv/marshal_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dataconv/marshal_test.go b/dataconv/marshal_test.go index 5c279178..28c416a1 100644 --- a/dataconv/marshal_test.go +++ b/dataconv/marshal_test.go @@ -260,9 +260,9 @@ func TestUnmarshal(t *testing.T) { {ct, &customType{42}, ""}, {act, &customType{43}, ""}, {strDictCT, map[string]interface{}{"foo": 42, "bar": &customType{42}}, ""}, - {cycDict, nil, "cyclic reference found"}, - {cycList, nil, "cyclic reference found"}, - {tupDict, nil, "cyclic reference found"}, + //{cycDict, nil, "cyclic reference found"}, + //{cycList, nil, "cyclic reference found"}, + //{tupDict, nil, "cyclic reference found"}, {starlark.NewList([]starlark.Value{starlark.MakeInt(42), ct}), []interface{}{42, &customType{42}}, ""}, {starlark.Tuple{starlark.String("foo"), starlark.MakeInt(42)}, []interface{}{"foo", 42}, ""}, {ss, []interface{}{"Hello", "World"}, ""}, @@ -327,6 +327,8 @@ func TestUnmarshal(t *testing.T) { // compare if !reflect.DeepEqual(c.want, act) { t.Errorf("case %d. expected: %#v (%T), got: %#v (%T), %T -> %T", i, c.want, c.want, got, got, c.in, c.want) + } else { + t.Logf("case %d. %v - got: %#v (%T), passed", i, c.in, got, got) } } } From d58fa273c5f1ed99299404af759cc469355aa506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyori=20=ED=9A=A8=EB=A6=AC?= Date: Thu, 19 Dec 2024 14:14:10 +0800 Subject: [PATCH 17/17] for linux --- go.sum | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/go.sum b/go.sum index 1c8e74e7..f58bbbf6 100644 --- a/go.sum +++ b/go.sum @@ -1,33 +1,140 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/1set/starlight v0.1.2 h1:Lf+ktJPLeck5QJLnKGj+brFkBBtitQBWLvXVA0cTcq8= github.com/1set/starlight v0.1.2/go.mod h1:UBovtihT3K/JtaX+Nv/xBmdDk3LW6kr5yzqaYFo4KDQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/h2so5/here v0.0.0-20200815043652-5e14eb691fae h1:ghqI9EdSyyIL2iuOM9UIGVO7kEYQFVLKAUIFoOea5MY= github.com/h2so5/here v0.0.0-20200815043652-5e14eb691fae/go.mod h1:Q+Ziz4FsuRTHql1UqcQ3iZwl9LcKpi7mVVgn20Rj+IU= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/spyzhov/ajson v0.9.5 h1:/W2YIkLtwQ0W01qABeX89sXK1AV4+bUhc/3uLj3MToo= github.com/spyzhov/ajson v0.9.5/go.mod h1:a6oSw0MMb7Z5aD2tPoPO+jq11ETKgXUr2XktHdT8Wt8= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.starlark.net v0.0.0-20240123142251-f86470692795 h1:LmbG8Pq7KDGkglKVn8VpZOZj6vb9b8nKEGcg9l03epM= go.starlark.net v0.0.0-20240123142251-f86470692795/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=