From 9959753a6c00a000bf3c6a9ce6c419649cd37dc4 Mon Sep 17 00:00:00 2001 From: Elena Makarova Date: Thu, 6 Nov 2025 17:56:17 +0300 Subject: [PATCH] feat: update grammar and highlight --- package-lock.json | 22 +++++++++---------- package.json | 6 ++--- src/utils/monaco/constats.ts | 4 ++-- src/utils/monaco/yql/constants.ts | 1 + .../monaco/yql/yql.completionItemProvider.ts | 4 ++-- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 27555ed107..18713428cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "@gravity-ui/table": "^1.10.1", "@gravity-ui/uikit": "^7.23.0", "@gravity-ui/unipika": "^5.2.1", - "@gravity-ui/websql-autocomplete": "^13.7.0", + "@gravity-ui/websql-autocomplete": "^13.14.0", "@hookform/resolvers": "^3.10.0", "@mjackson/multipart-parser": "^0.8.2", "@reduxjs/toolkit": "^2.8.2", @@ -93,7 +93,7 @@ "lint-staged": "^15.3.0", "mini-css-extract-plugin": "^2.9.2", "monaco-editor-webpack-plugin": "^7.1.0", - "monaco-yql-languages": "^1.3.0", + "monaco-yql-languages": "^1.21.1", "npm-run-all": "^4.1.5", "postcss": "^8.5.1", "prettier": "^3.5.3", @@ -109,7 +109,7 @@ "typescript": "^5.8.3" }, "peerDependencies": { - "monaco-yql-languages": ">=1.3.0", + "monaco-yql-languages": ">=1.21.0", "prop-types": "^15.8.1", "react": "^18.3.1", "react-dom": "^18.3.1" @@ -3596,14 +3596,13 @@ "license": "MIT" }, "node_modules/@gravity-ui/websql-autocomplete": { - "version": "13.7.0", - "resolved": "https://registry.npmjs.org/@gravity-ui/websql-autocomplete/-/websql-autocomplete-13.7.0.tgz", - "integrity": "sha512-94lEiBz60MklVkhZKRUGf8dpt79M+sGKau++TBq+mj3j1owSJk39c3ic6Kwk2X04R+A5TREoaw0aKIwdnskSHQ==", + "version": "13.14.0", + "resolved": "https://registry.npmjs.org/@gravity-ui/websql-autocomplete/-/websql-autocomplete-13.14.0.tgz", + "integrity": "sha512-yPczv74DlbAdUHfvYiAIhwbP1UOBxRglNkkUfikNU/p+1vY27DKe7PKYzYQrjX+/0e9cjDThJ/x4cyGdJewzMw==", "license": "Apache-2.0", "dependencies": { "antlr4-c3": "^3.4.1", - "antlr4ng": "^3.0.4", - "json5": "^2.2.3" + "antlr4ng": "^3.0.4" }, "engines": { "node": ">=16.0" @@ -17703,6 +17702,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, "bin": { "json5": "lib/cli.js" }, @@ -18762,9 +18762,9 @@ } }, "node_modules/monaco-yql-languages": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/monaco-yql-languages/-/monaco-yql-languages-1.3.0.tgz", - "integrity": "sha512-E7pQV6rqXscOnomRRM7wkQKD4nCqsq2rNHrqh58mNbuxpJAO8Zs0ITPlKsSIbHe6olqn8Y+7mSc+E9DKi9gJvg==", + "version": "1.21.1", + "resolved": "https://registry.npmjs.org/monaco-yql-languages/-/monaco-yql-languages-1.21.1.tgz", + "integrity": "sha512-Yg9wByTwjZkbzry4OECLow9RYdiEVZDt2ZNdX+v7QIXQHOuQEIHzv+sJIn+0rO39OncqJxHJDQEPN+z0SqhxRQ==", "dev": true, "license": "MIT", "peerDependencies": { diff --git a/package.json b/package.json index 0028522ea2..e211b879bd 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@gravity-ui/table": "^1.10.1", "@gravity-ui/uikit": "^7.23.0", "@gravity-ui/unipika": "^5.2.1", - "@gravity-ui/websql-autocomplete": "^13.7.0", + "@gravity-ui/websql-autocomplete": "^13.14.0", "@hookform/resolvers": "^3.10.0", "@mjackson/multipart-parser": "^0.8.2", "@reduxjs/toolkit": "^2.8.2", @@ -156,7 +156,7 @@ "lint-staged": "^15.3.0", "mini-css-extract-plugin": "^2.9.2", "monaco-editor-webpack-plugin": "^7.1.0", - "monaco-yql-languages": "^1.3.0", + "monaco-yql-languages": "^1.21.1", "npm-run-all": "^4.1.5", "postcss": "^8.5.1", "prettier": "^3.5.3", @@ -172,7 +172,7 @@ "typescript": "^5.8.3" }, "peerDependencies": { - "monaco-yql-languages": ">=1.3.0", + "monaco-yql-languages": ">=1.21.0", "prop-types": "^15.8.1", "react": "^18.3.1", "react-dom": "^18.3.1" diff --git a/src/utils/monaco/constats.ts b/src/utils/monaco/constats.ts index cd6f938da0..6b575e4913 100644 --- a/src/utils/monaco/constats.ts +++ b/src/utils/monaco/constats.ts @@ -1,2 +1,2 @@ -export const S_EXPRESSION_LANGUAGE_ID = 's-expression'; -export const YQL_LANGUAGE_ID = 'yql'; +export const S_EXPRESSION_LANGUAGE_ID = 's-expression_unstable'; +export const YQL_LANGUAGE_ID = 'yql_unstable'; diff --git a/src/utils/monaco/yql/constants.ts b/src/utils/monaco/yql/constants.ts index 5af55ad67c..1f25d4fdd6 100644 --- a/src/utils/monaco/yql/constants.ts +++ b/src/utils/monaco/yql/constants.ts @@ -756,4 +756,5 @@ export const EntitySettings: Record = { replication: ['ENDPOINT', 'DATABASE', 'USER', 'PASSWORD'], tableIndex: [], topicConsumer: ['important', 'read_from'], + streamingQuery: ['RUN'], }; diff --git a/src/utils/monaco/yql/yql.completionItemProvider.ts b/src/utils/monaco/yql/yql.completionItemProvider.ts index 7708de1172..c47de123f2 100644 --- a/src/utils/monaco/yql/yql.completionItemProvider.ts +++ b/src/utils/monaco/yql/yql.completionItemProvider.ts @@ -1,10 +1,10 @@ import type {YQLEntity} from '@gravity-ui/websql-autocomplete/yql'; import type {FetchedColumn} from 'monaco-yql-languages/build/yql/autocomplete'; import {registerCompletionItemProvider} from 'monaco-yql-languages/build/yql/autocomplete'; -import {LANGUAGE_ID} from 'monaco-yql-languages/build/yql/yql.contribution'; import {isAutocompleteColumn} from '../../../types/api/autocomplete'; import type {TAutocompleteEntity} from '../../../types/api/autocomplete'; +import {YQL_LANGUAGE_ID} from '../constats'; import { checkIsDirectory, @@ -66,7 +66,7 @@ export function registerYQLCompletionItemProvider(database: string) { return result; }; - registerCompletionItemProvider(LANGUAGE_ID, [' ', '.', '`', '(', '/'], { + registerCompletionItemProvider(YQL_LANGUAGE_ID, [' ', '.', '`', '(', '/'], { fetchEntities, fetchEntityColumns, getEntitySettings,