ydb-embedded-ui 6.0.1 → 6.2.0

package/dist/utils/monaco/yql/yql.js

@@ -0,0 +1,180 @@
+import { builtinFunctions, keywords, typeKeywords } from './yql.keywords';
+export const conf = {
+    comments: {
+        lineComment: '--',
+        blockComment: ['/*', '*/'],
+    },
+    brackets: [
+        ['{', '}'],
+        ['[', ']'],
+        ['(', ')'],
+    ],
+    autoClosingPairs: [
+        { open: '{', close: '}' },
+        { open: '[', close: ']' },
+        { open: '(', close: ')' },
+        { open: '"', close: '"' },
+        { open: "'", close: "'" },
+        { open: '`', close: '`' },
+    ],
+    surroundingPairs: [
+        { open: '{', close: '}' },
+        { open: '[', close: ']' },
+        { open: '(', close: ')' },
+        { open: '"', close: '"' },
+        { open: "'", close: "'" },
+        { open: '`', close: '`' },
+    ],
+    wordPattern: /(-?\d*\.\d\w*)|([^`~!@#%^&*()\-=+[{\]}\\|;:'",./?\s]+)/g,
+};
+export function getLanguage({ ansi = false, } = {}) {
+    return {
+        defaultToken: 'text',
+        ignoreCase: true,
+        brackets: [
+            { open: '[', close: ']', token: 'delimiter.square' },
+            { open: '(', close: ')', token: 'delimiter.parenthesis' },
+            { open: '{', close: '}', token: 'delimiter.curly' },
+        ],
+        keywords,
+        typeKeywords,
+        constants: ['true', 'false'],
+        builtinFunctions,
+        operators: [
+            '+',
+            '-',
+            '/',
+            '//',
+            '%',
+            '<@>',
+            '@>',
+            '<@',
+            '&',
+            '^',
+            '~',
+            '<',
+            '>',
+            '<=',
+            '>=',
+            '=>',
+            '==',
+            '!=',
+            '<>',
+            '=',
+        ],
+        symbols: /[=><!~?:&|+\-*/^%]+/,
+        escapes: /\\(?:[abfnrtv\\"'`]|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
+        variables: /[a-zA-Z_]\w*/,
+        tokenizer: {
+            root: [
+                { include: '@whitespace' },
+                { include: '@comments' },
+                { include: '@numbers' },
+                { include: '@tablePath' },
+                { include: '@strings' },
+                // support function
+                [/(@variables)::(@variables)/, 'support.function'],
+                [/[;,.]/, 'delimiter'],
+                [/[(){}[\]]/, '@brackets'],
+                // identifiers and keywords
+                [
+                    /@?[a-zA-Z_$]\w*/,
+                    {
+                        cases: {
+                            '@keywords': 'keyword',
+                            '@typeKeywords': 'keyword.type',
+                            '@constants': 'constant.yql',
+                            '@builtinFunctions': 'constant.other.color',
+                            '[$@][a-zA-Z_]\\w*': 'variable',
+                            '@default': 'identifier',
+                        },
+                    },
+                ],
+                [
+                    /@symbols/,
+                    {
+                        cases: {
+                            '@operators': 'operator.sql',
+                            '@default': '',
+                        },
+                    },
+                ],
+            ],
+            whitespace: [[/\s+/, 'white']],
+            comments: [
+                [/--.*/, 'comment'],
+                [/\/\*/, { token: 'comment.quote', next: ansi ? '@commentAnsi' : '@comment' }],
+            ],
+            comment: [
+                [/[^*/]+/, 'comment'],
+                [/\*\//, { token: 'comment.quote', next: '@pop' }],
+                [/./, 'comment'],
+            ],
+            commentAnsi: [
+                [/\/\*/, { token: 'comment.quote', next: '@comment' }],
+                [/[^*/]+/, 'comment'],
+                [/\*\//, { token: 'comment.quote', next: '@pop' }],
+                [/./, 'comment'],
+            ],
+            numbers: [
+                [/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?f?\b/, 'number.float'],
+                [/[+-]?(?:\d+|0b[01]+|0o[0-8]+|0x[\da-f]+)(?:u?[lst]?)?\b/, 'number'],
+            ],
+            strings: [
+                [/'/, { token: 'string', next: ansi ? '@stringAnsiSingle' : '@stringSingle' }],
+                [/"/, { token: 'string', next: ansi ? '@stringAnsiDouble' : '@stringDouble' }],
+                [/[@]{2}/, { token: 'string', next: '@multilineString' }],
+            ],
+            stringSingle: [
+                [/[^\\']+/, 'string'],
+                [/@escapes/, 'string.escape'],
+                [/\\./, 'string.escape.invalid'],
+                [/'[uyj]?/, { token: 'string', next: '@pop' }],
+            ],
+            stringAnsiSingle: [
+                [/[^']+/, 'string'],
+                [/''/, 'string'],
+                [/'[uyj]?/, { token: 'string', next: '@pop' }],
+            ],
+            stringDouble: [
+                [/[^\\"]+/, 'string'],
+                [/@escapes/, 'string.escape'],
+                [/\\./, 'string.escape.invalid'],
+                [/"[uyj]?/, { token: 'string', next: '@pop' }],
+            ],
+            stringAnsiDouble: [
+                [/[^"]+/, 'string'],
+                [/""/, 'string'],
+                [/"[uyj]?/, { token: 'string', next: '@pop' }],
+            ],
+            multilineString: [
+                [
+                    /#py/,
+                    { token: 'string.python', nextEmbedded: 'python', next: '@embedded', goBack: 3 },
+                ],
+                [
+                    /\/\/js/,
+                    { token: 'string.js', nextEmbedded: 'javascript', next: '@embedded', goBack: 4 },
+                ],
+                [/[^@]+/, 'string'],
+                [/[@]{4}/, 'string'],
+                [/[@]{2}[uyj]?/, { token: 'string', next: '@pop' }],
+                [/./, 'string'],
+            ],
+            embedded: [
+                [
+                    /([^@]|^)([@]{4})*[@]{2}([@]([^@]|$)|[^@]|$)/,
+                    { token: '@rematch', next: '@pop', nextEmbedded: '@pop' },
+                ],
+            ],
+            tablePath: [[/((`)?[\w/]+\2\s*\.\s*)?`/, { token: 'string.tablepath', next: '@table' }]],
+            table: [
+                [/[^\\`]+/, 'string.tablepath'],
+                [/``/, 'string.tablepath'],
+                [/@escapes/, 'string.escape.tablepath'],
+                [/\\./, 'string.escape.invalid.tablepath'],
+                [/`/, { token: 'string.tablepath', next: '@pop' }],
+            ],
+        },
+    };
+}

package/dist/utils/monaco/yql/yql.keywords.d.ts

@@ -0,0 +1,3 @@
+export declare const keywords: string[];
+export declare const typeKeywords: string[];
+export declare const builtinFunctions: string[];

package/dist/utils/monaco/yql/yql.keywords.js

@@ -0,0 +1,3 @@
+export const keywords = '$row|$rows|action|all|and|any|as|asc|assume|begin|bernoulli|between|by|case|columns|commit|compact|create|cross|cube|declare|define|delete|desc|dict|discard|distinct|do|drop|else|empty_action|end|erase|evaluate|exclusion|exists|export|flatten|for|from|full|group|grouping|having|if|ignore|ilike|import|in|inner|insert|into|is|join|left|like|limit|list|match|not|null|nulls|offset|on|only|optional|or|order|over|partition|pragma|presort|process|reduce|regexp|repeatable|replace|respect|result|return|right|rlike|rollup|sample|schema|select|semi|set|sets|stream|subquery|table|tablesample|then|truncate|union|update|upsert|use|using|values|view|when|where|window|with|without|xor'.split('|');
+export const typeKeywords = 'bool|date|datetime|decimal|double|float|int16|int32|int64|int8|interval|json|string|timestamp|tzdate|tzdatetime|tztimestamp|uint16|uint32|uint64|uint8|utf8|uuid|yson'.split('|');
+export const builtinFunctions = 'abs|aggregate_by|aggregate_list|aggregate_list_distinct|agg_list|agg_list_distinct|as_table|avg|avg_if|adaptivedistancehistogram|adaptivewardhistogram|adaptiveweighthistogram|addmember|addtimezone|aggregateflatten|aggregatetransforminput|aggregatetransformoutput|aggregationfactory|asatom|asdict|asdictstrict|asenum|aslist|asliststrict|asset|assetstrict|asstruct|astagged|astuple|asvariant|atomcode|bitcast|bit_and|bit_or|bit_xor|bool_and|bool_or|bool_xor|bottom|bottom_by|blockwardhistogram|blockweighthistogram|cast|coalesce|concat|concat_strict|correlation|count|count_if|covariance|covariance_population|covariance_sample|callableargument|callableargumenttype|callableresulttype|callabletype|callabletypecomponents|callabletypehandle|choosemembers|combinemembers|countdistinctestimate|currentauthenticateduser|currentoperationid|currentoperationsharedid|currenttzdate|currenttzdatetime|currenttztimestamp|currentutcdate|currentutcdatetime|currentutctimestamp|dense_rank|datatype|datatypecomponents|datatypehandle|dictaggregate|dictcontains|dictcreate|dicthasitems|dictitems|dictkeytype|dictkeys|dictlength|dictlookup|dictpayloadtype|dictpayloads|dicttype|dicttypecomponents|dicttypehandle|each|each_strict|emptydicttype|emptydicttypehandle|emptylisttype|emptylisttypehandle|endswith|ensure|ensureconvertibleto|ensuretype|enum|evaluateatom|evaluatecode|evaluateexpr|evaluatetype|expandstruct|filter|filter_strict|find|first_value|folder|filecontent|filepath|flattenmembers|forceremovemember|forceremovemembers|forcerenamemembers|forcespreadmembers|formatcode|formattype|frombytes|funccode|greatest|grouping|gathermembers|generictype|histogram|hll|hyperloglog|if|if_strict|instanceof|json_exists|json_query|json_value|jointablerow|just|lag|last_value|lead|least|len|length|like|likely|like_strict|lambdaargumentscount|lambdacode|linearhistogram|listaggregate|listall|listany|listavg|listcode|listcollect|listconcat|listcreate|listdistinct|listenumerate|listextend|listextendstrict|listextract|listfilter|listflatmap|listflatten|listfromrange|listhas|listhasitems|listhead|listindexof|listitemtype|listlast|listlength|listmap|listmax|listmin|listnotnull|listreplicate|listreverse|listskip|listskipwhile|listskipwhileinclusive|listsort|listsortasc|listsortdesc|listsum|listtake|listtakewhile|listtakewhileinclusive|listtype|listtypehandle|listunionall|listuniq|listzip|listzipall|loghistogram|logarithmichistogram|max|max_by|max_of|median|min|min_by|min_of|mode|multi_aggregate_by|nanvl|nvl|nothing|nulltype|nulltypehandle|optionalitemtype|optionaltype|optionaltypehandle|percentile|parsefile|parsetype|parsetypehandle|pickle|quotecode|range|range_strict|rank|regexp|regexp_strict|rfind|row_number|random|randomnumber|randomuuid|removemember|removemembers|removetimezone|renamemembers|replacemember|reprcode|resourcetype|resourcetypehandle|resourcetypetag|some|stddev|stddev_population|stddev_sample|substring|sum|sum_if|sessionstart|sessionwindow|setcreate|setdifference|setincludes|setintersection|setisdisjoint|setsymmetricdifference|setunion|spreadmembers|stablepickle|startswith|staticmap|streamitemtype|streamtype|streamtypehandle|structmembertype|structmembers|structtypecomponents|structtypehandle|subqueryextend|subqueryextendfor|subquerymerge|subquerymergefor|subqueryunionall|subqueryunionallfor|subqueryunionmerge|subqueryunionmergefor|top|topfreq|top_by|tablename|tablepath|tablerecordindex|tablerow|taggedtype|taggedtypecomponents|taggedtypehandle|tobytes|todict|tomultidict|toset|tosorteddict|tosortedmultidict|trymember|tupleelementtype|tupletype|tupletypecomponents|tupletypehandle|typehandle|typekind|typeof|udaf|unittype|unpickle|untag|unwrap|variance|variance_population|variance_sample|variant|varianttype|varianttypehandle|variantunderlyingtype|voidtype|voidtypehandle|way|worldcode'.split('|');

package/dist/utils/monaco/{yqlSuggestions → yql}/yqlSuggestions.js

@@ -1,18 +1,24 @@
 import { generateAggregateFunctionsSuggestion, generateColumnAliasesSuggestion, generateColumnsSuggestion, generateEntitiesSuggestion, generateKeywordsSuggestion, generatePragmasSuggestion, generateSimpleFunctionsSuggestion, generateSimpleTypesSuggestion, generateTableFunctionsSuggestion, generateUdfSuggestion, generateWindowFunctionsSuggestion, } from './generateSuggestions';
 export function createProvideSuggestionsFunction(database) {
     return async (model, monacoCursorPosition, _context, _token) => {
-        const cursorPosition = {
-            line: monacoCursorPosition.lineNumber,
-            column: monacoCursorPosition.column,
-        };
         const rangeToInsertSuggestion = getRangeToInsertSuggestion(model, monacoCursorPosition);
-        const suggestions = await getSuggestions(model, cursorPosition, rangeToInsertSuggestion, database);
+        const suggestions = await getSuggestions(model, monacoCursorPosition, rangeToInsertSuggestion, database);
         return { suggestions };
     };
 }
+function getEntityNameAtCursor(model, cursorPosition) {
+    var _a, _b, _c, _d;
+    const prevWord = model.findPreviousMatch('\\s(`?[^\\s]*)', cursorPosition, true, false, null, true);
+    const nextWord = model.findNextMatch('([^\\s]*)`?', cursorPosition, true, false, null, true);
+    return `${(_b = (_a = prevWord === null || prevWord === void 0 ? void 0 : prevWord.matches) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : ''}${(_d = (_c = nextWord === null || nextWord === void 0 ? void 0 : nextWord.matches) === null || _c === void 0 ? void 0 : _c[1]) !== null && _d !== void 0 ? _d : ''}`;
+}
 async function getSuggestions(model, cursorPosition, rangeToInsertSuggestion, database) {
     const { parseYqlQuery } = await import('@gravity-ui/websql-autocomplete');
-    const parseResult = parseYqlQuery(model.getValue(), cursorPosition);
+    const cursorForParsing = {
+        line: cursorPosition.lineNumber,
+        column: cursorPosition.column,
+    };
+    const parseResult = parseYqlQuery(model.getValue(), cursorForParsing);
     let entitiesSuggestions = [];
     let functionsSuggestions = [];
     let aggregateFunctionsSuggestions = [];
@@ -22,7 +28,8 @@ async function getSuggestions(model, cursorPosition, rangeToInsertSuggestion, da
     let simpleTypesSuggestions = [];
     let pragmasSuggestions = [];
     if (parseResult.suggestEntity) {
-        entitiesSuggestions = await generateEntitiesSuggestion(rangeToInsertSuggestion);
+        const entityNamePrefix = getEntityNameAtCursor(model, cursorPosition);
+        entitiesSuggestions = await generateEntitiesSuggestion(rangeToInsertSuggestion, parseResult.suggestEntity, database, entityNamePrefix);
     }
     if (parseResult.suggestFunctions) {
         functionsSuggestions = await generateSimpleFunctionsSuggestion(rangeToInsertSuggestion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "6.0.1",
+  "version": "6.2.0",
   "files": [
     "dist"
   ],
@@ -12,16 +12,16 @@
   "dependencies": {
     "@bem-react/classname": "^1.6.0",
     "@gravity-ui/axios-wrapper": "^1.4.1",
-    "@gravity-ui/chartkit": "^5.3.0",
-    "@gravity-ui/components": "^3.4.1",
-    "@gravity-ui/date-utils": "^2.2.0",
-    "@gravity-ui/i18n": "^1.4.0",
+    "@gravity-ui/chartkit": "^5.5.0",
+    "@gravity-ui/components": "^3.6.0",
+    "@gravity-ui/date-utils": "^2.4.0",
+    "@gravity-ui/i18n": "^1.5.0",
     "@gravity-ui/icons": "^2.9.1",
-    "@gravity-ui/navigation": "^2.7.0",
-    "@gravity-ui/paranoid": "^1.4.1",
-    "@gravity-ui/react-data-table": "^2.0.1",
-    "@gravity-ui/uikit": "^6.10.2",
-    "@gravity-ui/websql-autocomplete": "^8.0.2",
+    "@gravity-ui/navigation": "^2.10.0",
+    "@gravity-ui/paranoid": "^2.0.1",
+    "@gravity-ui/react-data-table": "^2.1.1",
+    "@gravity-ui/uikit": "^6.15.0",
+    "@gravity-ui/websql-autocomplete": "^8.1.0",
     "@reduxjs/toolkit": "^2.2.3",
     "axios": "^1.6.8",
     "colord": "^2.9.3",
@@ -70,7 +70,7 @@
     "prepublishOnly": "npm run package",
     "typecheck": "tsc --noEmit",
     "prepare": "husky",
-    "test:e2e:install": "npx playwright install --with-deps chromium",
+    "test:e2e:install": "npx playwright install --with-deps",
     "test:e2e": "npx playwright test --config=playwright.config.ts"
   },
   "lint-staged": {
@@ -122,7 +122,7 @@
   "devDependencies": {
     "@commitlint/cli": "^19.2.1",
     "@commitlint/config-conventional": "^19.1.0",
-    "@gravity-ui/eslint-config": "^3.1.1",
+    "@gravity-ui/eslint-config": "^3.2.0",
     "@gravity-ui/prettier-config": "^1.1.0",
     "@gravity-ui/stylelint-config": "^4.0.1",
     "@gravity-ui/tsconfig": "^1.0.0",

package/dist/containers/Tenant/Diagnostics/TopShards/Filters/Filters.scss

@@ -1,8 +0,0 @@
-.top-shards {
-    &__filters {
-        display: flex;
-        flex-wrap: wrap;
-        align-items: baseline;
-        gap: 16px;
-    }
-}