From c1c7f22bac9d0d30f1d7049c4a13e828b6409eac Mon Sep 17 00:00:00 2001 From: Rafal Strzalinski Date: Tue, 8 Apr 2025 16:44:31 +0200 Subject: [PATCH] Use new transpiler --- .config/tsconfig.json | 7 ++- go.mod | 2 +- go.sum | 46 ++++++------------- pkg/plugin/backend/exec.go | 7 +-- .../ObservabilityQueryLanguageComponent.tsx | 1 + tsconfig.json | 5 +- 6 files changed, 28 insertions(+), 40 deletions(-) diff --git a/.config/tsconfig.json b/.config/tsconfig.json index 15e64ac..cdde4ad 100644 --- a/.config/tsconfig.json +++ b/.config/tsconfig.json @@ -11,7 +11,12 @@ "rootDir": "../src", "baseUrl": "../src", "typeRoots": ["../node_modules/@types"], - "resolveJsonModule": true + "resolveJsonModule": true, + "target": "ES2020", + "module": "CommonJS", + "strict": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true }, "ts-node": { "compilerOptions": { diff --git a/go.mod b/go.mod index 9f94658..76ba301 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.24.1 require ( github.com/ClickHouse/clickhouse-go/v2 v2.32.2 github.com/DataDog/go-sqllexer v0.1.3 - github.com/QuesmaOrg/quesma/platform v0.0.0-20250331153816-60b67f381c7d + github.com/QuesmaOrg/quesma/platform v0.0.0-20250408113329-603b815741fa github.com/grafana/grafana-plugin-sdk-go v0.269.0 github.com/stretchr/testify v1.10.0 ) diff --git a/go.sum b/go.sum index 9249a93..c633085 100644 --- a/go.sum +++ b/go.sum @@ -11,38 +11,18 @@ github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7Oputl github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/go-sqllexer v0.1.3 h1:Kl2T6QVndMEZqQSY8rkoltYP+LVNaA54N+EwAMc9N5w= github.com/DataDog/go-sqllexer v0.1.3/go.mod h1:KwkYhpFEVIq+BfobkTC1vfqm4gTi65skV/DpDBXtexc= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250326164601-5b727158cf5a h1:FQ5v+fterM+XLlqA1tpoHGJ8SF71haT9TPxh2GtuhDI= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250326164601-5b727158cf5a/go.mod h1:0lSmZXzM1g98FZpIpfUxkCBmyEzj120GZ+qeyAsVH64= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250330075245-577e5811125c h1:q5nROZeyIFRAIiAcgyk3IadpV2T3jK+ZrEhDZXZruAs= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250330075245-577e5811125c/go.mod h1:0lSmZXzM1g98FZpIpfUxkCBmyEzj120GZ+qeyAsVH64= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331085959-428f1d9a6af2 h1:gZUq67X2e7XulQnnAQNw1w5FY0OIFUOhb9JP6lChMaE= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331085959-428f1d9a6af2/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331090856-9e0dea913db7 h1:fi7g3GeEjgheNQF8BupP1JTmsy61zc90Ra92fEKmqRQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331090856-9e0dea913db7/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331092649-2e2e8660df81 h1:t8pmYhrF8RK0oyAbrMQUJXygnj4Ov++ew/KustL4s8c= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331092649-2e2e8660df81/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331111204-fe1ed0953faf h1:s4EkUGJY6wXJlIdJf8ZDYSUkWUcPGrtlZ7TpDOk4rlc= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331111204-fe1ed0953faf/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331112404-40f24be62c8a h1:t9ME7BBL+pPshYamvi4tCeAKK1dAXo1Jnl6Z0x5reXE= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331112404-40f24be62c8a/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331132614-d252dca17223 h1:k4Ri3ggS+TCcXbPsLLcwWwpY0K2NA0EpqypTkaA5wbs= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331132614-d252dca17223/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331134131-8227364cce97 h1:ADQIfwOwgE2iUBcdUKaB008t2/xgnOMv4JoQmNzugHg= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331134131-8227364cce97/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331143618-ac8c95a92850 h1:qHmL6hmb51GNfBINIQFtkwDvw5vS1sLhXNrXljpm3pQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331143618-ac8c95a92850/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331144540-512759b25033 h1:G0iiC6vsVVHUPZx19Z50jJXwu/gzTlQe99J6hcCpuwg= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331144540-512759b25033/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331145336-7c58024c3bcc h1:QixH5m/LC0biagO/dTEGzLCfuumIxtpQkxmcQ4QDotE= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331145336-7c58024c3bcc/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331152041-2345ca96a35a h1:vdxrIlkQUK9zXYdeCbKmu5sFauwiU7NeBW5w5sQnVjI= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331152041-2345ca96a35a/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331152602-161c28e957c1 h1:5LvlIjiAl0gXyDV5xtXrOGsnNF+s3Ao78IsvdfOtzwU= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331152602-161c28e957c1/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331153153-a5b0f3d48c7f h1:Y6rP+kIdzWTb/DZvBSrv9jje7B5XaSOLlszsbP/T21c= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331153153-a5b0f3d48c7f/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331153816-60b67f381c7d h1:Sb0llKYKsHS7dhKEFP0Emlpdx4ytQ2MHmz2ANC3WJQ0= -github.com/QuesmaOrg/quesma/platform v0.0.0-20250331153816-60b67f381c7d/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250407120237-a131ae6053a1 h1:iJlQC7lOaFM4LGsXF/eWk+qywQlnKCVcFsXbzx5a6lg= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250407120237-a131ae6053a1/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250407124700-2db9c2a249ea h1:fxDs7r0uMcSYF+ffL6BmTWndmJK6lshc3S0vQf5nK2I= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250407124700-2db9c2a249ea/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250407140403-bb667b0126c2 h1:pj3xRWVY3HHYkva7+cw+qec9n1SstKabpyEGvjRA+Bo= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250407140403-bb667b0126c2/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250407152253-051f5b93a685 h1:2zE7QxwAWP5Rf/AEu5uQF0ZsA5ScLNNcC4u3NG6z0DM= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250407152253-051f5b93a685/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250408085219-83ea6408efad h1:CiB8K9sVfKf/4lGUbxN1Cbh3ig7BCwPLMJsStG/CB4k= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250408085219-83ea6408efad/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250408113329-603b815741fa h1:Qac0fcJFlyGDm3eWgtVtGkZ/3UxJYKIZeHg+OnTwAJk= +github.com/QuesmaOrg/quesma/platform v0.0.0-20250408113329-603b815741fa/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ= github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= github.com/apache/arrow-go/v18 v18.0.1-0.20241212180703-82be143d7c30 h1:hXVi7QKuCQ0E8Yujfu9b0f0RnzZ72efpWvPnZgnJPrE= @@ -189,6 +169,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40= github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/pkg/plugin/backend/exec.go b/pkg/plugin/backend/exec.go index 2a4f590..2f52432 100644 --- a/pkg/plugin/backend/exec.go +++ b/pkg/plugin/backend/exec.go @@ -88,13 +88,10 @@ func HandleExec(w http.ResponseWriter, r *http.Request) { pipe_syntax.GroupPipeSyntax(node) pipe_syntax.ExpandMacros(node) pipe_syntax.ExpandEnrichments(node, DefaultDB) - pipe_syntax.Transpile(node) + pipe_syntax.TranspileToCTE(node) transpiledSQL = transforms.ConcatTokenNodes(node) - // Make the SQL pretty for now - prettyTranspiledSQL := SqlPrettyPrint([]byte(transpiledSQL)) - log.Println("Transpiled SQL: ", transpiledSQL) // FIXME: this should run pretty-printed SQL @@ -117,7 +114,7 @@ func HandleExec(w http.ResponseWriter, r *http.Request) { response := ExecResponse{ Table: res, - TranspiledSQL: prettyTranspiledSQL, + TranspiledSQL: transpiledSQL, } responseBody, err := json.Marshal(response) diff --git a/src/components/App/ObservabilityQueryLanguageComponent.tsx b/src/components/App/ObservabilityQueryLanguageComponent.tsx index 45bde94..ac33224 100644 --- a/src/components/App/ObservabilityQueryLanguageComponent.tsx +++ b/src/components/App/ObservabilityQueryLanguageComponent.tsx @@ -30,6 +30,7 @@ const defaultQuery = `FROM apache_logs |> LIMIT 100`; + export default function ObservabilityQueryLanguageComponent() { // Add URL handling logic at the start of the component const getInitialQuery = () => { diff --git a/tsconfig.json b/tsconfig.json index 102e45b..bd827d6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,3 +1,6 @@ { - "extends": "./.config/tsconfig.json" + "extends": "./.config/tsconfig.json", + "compilerOptions": { + "esModuleInterop": true + } }