Skip to content

Commit c1c7f22

Browse files
nablaonenablaone
committed
Use new transpiler
1 parent 0a57acf commit c1c7f22

File tree

6 files changed

+28
-40
lines changed

6 files changed

+28
-40
lines changed

‎.config/tsconfig.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@
1111
"rootDir": "../src",
1212
"baseUrl": "../src",
1313
"typeRoots": ["../node_modules/@types"],
14-
"resolveJsonModule": true
14+
"resolveJsonModule": true,
15+
"target": "ES2020",
16+
"module": "CommonJS",
17+
"strict": true,
18+
"skipLibCheck": true,
19+
"forceConsistentCasingInFileNames": true
1520
},
1621
"ts-node": {
1722
"compilerOptions": {

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.24.1
77
require (
88
github.com/ClickHouse/clickhouse-go/v2 v2.32.2
99
github.com/DataDog/go-sqllexer v0.1.3
10-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331153816-60b67f381c7d
10+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250408113329-603b815741fa
1111
github.com/grafana/grafana-plugin-sdk-go v0.269.0
1212
github.com/stretchr/testify v1.10.0
1313
)

‎go.sum‎

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,38 +11,18 @@ github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7Oputl
1111
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
1212
github.com/DataDog/go-sqllexer v0.1.3 h1:Kl2T6QVndMEZqQSY8rkoltYP+LVNaA54N+EwAMc9N5w=
1313
github.com/DataDog/go-sqllexer v0.1.3/go.mod h1:KwkYhpFEVIq+BfobkTC1vfqm4gTi65skV/DpDBXtexc=
14-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250326164601-5b727158cf5a h1:FQ5v+fterM+XLlqA1tpoHGJ8SF71haT9TPxh2GtuhDI=
15-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250326164601-5b727158cf5a/go.mod h1:0lSmZXzM1g98FZpIpfUxkCBmyEzj120GZ+qeyAsVH64=
16-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250330075245-577e5811125c h1:q5nROZeyIFRAIiAcgyk3IadpV2T3jK+ZrEhDZXZruAs=
17-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250330075245-577e5811125c/go.mod h1:0lSmZXzM1g98FZpIpfUxkCBmyEzj120GZ+qeyAsVH64=
18-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331085959-428f1d9a6af2 h1:gZUq67X2e7XulQnnAQNw1w5FY0OIFUOhb9JP6lChMaE=
19-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331085959-428f1d9a6af2/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
20-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331090856-9e0dea913db7 h1:fi7g3GeEjgheNQF8BupP1JTmsy61zc90Ra92fEKmqRQ=
21-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331090856-9e0dea913db7/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
22-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331092649-2e2e8660df81 h1:t8pmYhrF8RK0oyAbrMQUJXygnj4Ov++ew/KustL4s8c=
23-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331092649-2e2e8660df81/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
24-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331111204-fe1ed0953faf h1:s4EkUGJY6wXJlIdJf8ZDYSUkWUcPGrtlZ7TpDOk4rlc=
25-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331111204-fe1ed0953faf/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
26-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331112404-40f24be62c8a h1:t9ME7BBL+pPshYamvi4tCeAKK1dAXo1Jnl6Z0x5reXE=
27-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331112404-40f24be62c8a/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
28-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331132614-d252dca17223 h1:k4Ri3ggS+TCcXbPsLLcwWwpY0K2NA0EpqypTkaA5wbs=
29-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331132614-d252dca17223/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
30-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331134131-8227364cce97 h1:ADQIfwOwgE2iUBcdUKaB008t2/xgnOMv4JoQmNzugHg=
31-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331134131-8227364cce97/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
32-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331143618-ac8c95a92850 h1:qHmL6hmb51GNfBINIQFtkwDvw5vS1sLhXNrXljpm3pQ=
33-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331143618-ac8c95a92850/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
34-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331144540-512759b25033 h1:G0iiC6vsVVHUPZx19Z50jJXwu/gzTlQe99J6hcCpuwg=
35-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331144540-512759b25033/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
36-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331145336-7c58024c3bcc h1:QixH5m/LC0biagO/dTEGzLCfuumIxtpQkxmcQ4QDotE=
37-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331145336-7c58024c3bcc/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
38-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331152041-2345ca96a35a h1:vdxrIlkQUK9zXYdeCbKmu5sFauwiU7NeBW5w5sQnVjI=
39-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331152041-2345ca96a35a/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
40-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331152602-161c28e957c1 h1:5LvlIjiAl0gXyDV5xtXrOGsnNF+s3Ao78IsvdfOtzwU=
41-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331152602-161c28e957c1/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
42-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331153153-a5b0f3d48c7f h1:Y6rP+kIdzWTb/DZvBSrv9jje7B5XaSOLlszsbP/T21c=
43-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331153153-a5b0f3d48c7f/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
44-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331153816-60b67f381c7d h1:Sb0llKYKsHS7dhKEFP0Emlpdx4ytQ2MHmz2ANC3WJQ0=
45-
github.com/QuesmaOrg/quesma/platform v0.0.0-20250331153816-60b67f381c7d/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
14+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250407120237-a131ae6053a1 h1:iJlQC7lOaFM4LGsXF/eWk+qywQlnKCVcFsXbzx5a6lg=
15+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250407120237-a131ae6053a1/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
16+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250407124700-2db9c2a249ea h1:fxDs7r0uMcSYF+ffL6BmTWndmJK6lshc3S0vQf5nK2I=
17+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250407124700-2db9c2a249ea/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
18+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250407140403-bb667b0126c2 h1:pj3xRWVY3HHYkva7+cw+qec9n1SstKabpyEGvjRA+Bo=
19+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250407140403-bb667b0126c2/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
20+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250407152253-051f5b93a685 h1:2zE7QxwAWP5Rf/AEu5uQF0ZsA5ScLNNcC4u3NG6z0DM=
21+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250407152253-051f5b93a685/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
22+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250408085219-83ea6408efad h1:CiB8K9sVfKf/4lGUbxN1Cbh3ig7BCwPLMJsStG/CB4k=
23+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250408085219-83ea6408efad/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
24+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250408113329-603b815741fa h1:Qac0fcJFlyGDm3eWgtVtGkZ/3UxJYKIZeHg+OnTwAJk=
25+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250408113329-603b815741fa/go.mod h1:U6J3ruk1YmfChzFfcDiAK2bYlOxZfNkQ6DapvIwR8YQ=
4626
github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
4727
github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
4828
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
189169
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
190170
github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
191171
github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
172+
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
173+
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
192174
github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40=
193175
github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg=
194176
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

‎pkg/plugin/backend/exec.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,10 @@ func HandleExec(w http.ResponseWriter, r *http.Request) {
8888
pipe_syntax.GroupPipeSyntax(node)
8989
pipe_syntax.ExpandMacros(node)
9090
pipe_syntax.ExpandEnrichments(node, DefaultDB)
91-
pipe_syntax.Transpile(node)
91+
pipe_syntax.TranspileToCTE(node)
9292

9393
transpiledSQL = transforms.ConcatTokenNodes(node)
9494

95-
// Make the SQL pretty for now
96-
prettyTranspiledSQL := SqlPrettyPrint([]byte(transpiledSQL))
97-
9895
log.Println("Transpiled SQL: ", transpiledSQL)
9996

10097
// FIXME: this should run pretty-printed SQL
@@ -117,7 +114,7 @@ func HandleExec(w http.ResponseWriter, r *http.Request) {
117114

118115
response := ExecResponse{
119116
Table: res,
120-
TranspiledSQL: prettyTranspiledSQL,
117+
TranspiledSQL: transpiledSQL,
121118
}
122119

123120
responseBody, err := json.Marshal(response)

‎src/components/App/ObservabilityQueryLanguageComponent.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const defaultQuery = `FROM apache_logs
3030
|> LIMIT 100`;
3131

3232

33+
3334
export default function ObservabilityQueryLanguageComponent() {
3435
// Add URL handling logic at the start of the component
3536
const getInitialQuery = () => {

‎tsconfig.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"extends": "./.config/tsconfig.json"
2+
"extends": "./.config/tsconfig.json",
3+
"compilerOptions": {
4+
"esModuleInterop": true
5+
}
36
}

0 commit comments

Comments
 (0)