@kusto/monaco-kusto 5.3.9 → 5.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "5.3.9",
+    "version": "5.3.11",
     "description": "CSL, KQL plugin for the Monaco Editor",
     "author": {
         "name": "Microsoft"
@@ -18,8 +18,8 @@
     },
     "scripts": {
         "copy_runtime_deps_to_out": "mcopy ./node_modules/@kusto/language-service/Kusto.JavaScript.Client.min.js ./out/vs/language/kusto/kusto.javascript.client.min.js && mcopy ./node_modules/@kusto/language-service-next/Kusto.Language.Bridge.min.js ./out/vs/language/kusto/Kusto.Language.Bridge.min.js && mcopy ./node_modules/@kusto/language-service/bridge.min.js ./out/vs/language/kusto/bridge.min.js && node ./node_modules/copy-dir-cli/bin/copy ./node_modules/monaco-editor-core/dev/vs ./out/vs",
-        "compile": "tsc -p ./src/tsconfig.json && tsc -p ./src/tsconfig.esm.json",
-        "watch": "echo dev > test/mode.txt && tsc -p ./src/tsconfig.watch.json && npm run copy_runtime_deps_to_out && concurrently \"live-server ./ \" \"tsc -w -p ./src/tsconfig.watch.json \"",
+        "compile": "tsc -p ./tsconfig.json && tsc -p ./tsconfig.esm.json",
+        "watch": "echo dev > test/mode.txt && tsc -p ./tsconfig.watch.json && npm run copy_runtime_deps_to_out && concurrently \"live-server ./ \" \"tsc -w -p ./tsconfig.watch.json \"",
         "test_release": "echo release > test/mode.txt && http-server -c-1 -p 8080 ./ -o index.html",
         "copy_types_to_release": "mcopy ./src/monaco.d.ts ./release/esm/monaco.d.ts && mcopy ./out/amd/monaco.contribution.d.ts ./release/esm/monaco.contribution.d.ts && mcopy ./src/monaco.d.ts ./release/min/monaco.d.ts && mcopy ./out/amd/monaco.contribution.d.ts ./release/min/monaco.contribution.d.ts && mcopy ./node_modules/@kusto/language-service/Kusto.JavaScript.Client.min.js  ./release/min/kusto.javascript.client.min.js && mcopy ./node_modules/@kusto/language-service-next/Kusto.Language.Bridge.min.js ./release/min/Kusto.Language.Bridge.min.js && mcopy ./node_modules/@kusto/language-service/bridge.min.js ./release/min/bridge.min.js && mcopy ./node_modules/@kusto/language-service/newtonsoft.json.min.js ./release/min/newtonsoft.json.min.js",
         "prepublishOnly": "mkdirp release  && npm run compile && node ./scripts/release.js && node ./scripts/bundle.js && npm run copy_runtime_deps_to_out && npm run copy_types_to_release",
@@ -46,11 +46,11 @@
         "monaco-plugin-helpers": "^1.0.3",
         "object-assign": "4.1.0",
         "requirejs": "^2.3.6",
-        "terser": "^4.6.7",
+        "terser": "^5.16.2",
         "ts-jest": "^26.1.1",
-        "typescript": "3.9.7",
-        "vscode-languageserver-types": "3.16.0",
+        "typescript": "^4.0.0",
         "vscode-languageserver-textdocument": "1.0.4",
+        "vscode-languageserver-types": "3.16.0",
         "xregexp": "^3.2.0"
     },
     "dependencies": {
@@ -64,7 +64,7 @@
         "rootDir": "src",
         "globals": {
             "ts-jest": {
-                "tsConfigFile": "src/tsconfig.json"
+                "tsConfigFile": "./tsconfig.json"
             }
         },
         "transform": {
@@ -79,10 +79,5 @@
             "json",
             "node"
         ]
-    },
-    "prettier": {
-        "printWidth": 120,
-        "tabWidth": 4,
-        "singleQuote": true
     }
 }

package/release/dev/kustoMode.js

@@ -113,23 +113,69 @@ define('vs/language/kusto/languageService/kustoMonarchLanguageDefinition',["requ
     exports.KustoLanguageDefinition = {
         name: 'kusto',
         mimeTypes: ['text/kusto'],
-        displayName: "Kusto",
-        defaultToken: "invalid",
-        brackets: [['[', ']', 'delimiter.square'],
-            ['(', ')', 'delimiter.parenthesis']],
+        displayName: 'Kusto',
+        defaultToken: 'invalid',
+        brackets: [
+            ['[', ']', 'delimiter.square'],
+            ['(', ')', 'delimiter.parenthesis'],
+        ],
         wordDefinition: /(-?\d*\.\d\w*)|([^\`\~\!\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
         // .slice() call is for creating a shallow copy of the array since bridge.net shoves a $type property on the array which monaco doesn't like.
         promotedOperatorCommandTokens: Kusto.Data.IntelliSense.CslCommandParser.PromotedOperatorCommandTokens.slice(0),
         operatorCommandTokens: Kusto.Data.IntelliSense.CslCommandParser.OperatorCommandTokens.slice(0),
         keywords: [
-            'by', 'on', 'contains', 'notcontains', 'containscs', 'notcontainscs', 'startswith', 'has', 'matches', 'regex', 'true',
-            'false', 'and', 'or', 'typeof', 'int', 'string', 'date', 'datetime', 'time', 'long', 'real', '​boolean', 'bool'
+            'by',
+            'on',
+            'contains',
+            'notcontains',
+            'containscs',
+            'notcontainscs',
+            'startswith',
+            'has',
+            'matches',
+            'regex',
+            'true',
+            'false',
+            'and',
+            'or',
+            'typeof',
+            'int',
+            'string',
+            'date',
+            'datetime',
+            'time',
+            'long',
+            'real',
+            '​boolean',
+            'bool',
         ],
         operators: ['+', '-', '*', '/', '>', '<', '==', '<>', '<=', '>=', '~', '!~'],
         builtinFunctions: [
-            'countof', 'bin', 'extentid', 'extract', 'extractjson', 'floor', 'iif', 'isnull', 'isnotnull', 'notnull', 'isempty',
-            'isnotempty', 'notempty', 'now', 're2', 'strcat', 'strlen', 'toupper',
-            'tostring', 'count', 'cnt', 'sum', 'min', 'max', 'avg'
+            'countof',
+            'bin',
+            'extentid',
+            'extract',
+            'extractjson',
+            'floor',
+            'iif',
+            'isnull',
+            'isnotnull',
+            'notnull',
+            'isempty',
+            'isnotempty',
+            'notempty',
+            'now',
+            're2',
+            'strcat',
+            'strlen',
+            'toupper',
+            'tostring',
+            'count',
+            'cnt',
+            'sum',
+            'min',
+            'max',
+            'avg',
         ],
         tokenizer: {
             root: [
@@ -142,7 +188,9 @@ define('vs/language/kusto/languageService/kustoMonarchLanguageDefinition',["requ
                 [/[;,.]/, 'delimiter'],
                 [/[()\[\]]/, '@brackets'],
                 [/[<>=!%&+\-*/|~^]/, 'operator'],
-                [/[\w@#\-$]+/, {
+                [
+                    /[\w@#\-$]+/,
+                    {
                         cases: {
                             '@keywords': 'keyword',
                             '@promotedOperatorCommandTokens': 'operator.sql',
@@ -150,41 +198,44 @@ define('vs/language/kusto/languageService/kustoMonarchLanguageDefinition',["requ
                             '@operators': 'operator',
                             '@builtinFunctions': 'predefined',
                             '@default': 'identifier',
-                        }
-                    }],
+                        },
+                    },
+                ],
             ],
             whitespace: [[/\s+/, 'white']],
-            comments: [["\\/\\/+.*", "comment"]],
+            comments: [['\\/\\/+.*', 'comment']],
             numbers: [
                 [/0[xX][0-9a-fA-F]*/, 'number'],
                 [/[$][+-]*\d*(\.\d*)?/, 'number'],
-                [/((\d+(\.\d*)?)|(\.\d+))([eE][\-+]?\d+)?/, 'number']
+                [/((\d+(\.\d*)?)|(\.\d+))([eE][\-+]?\d+)?/, 'number'],
             ],
             strings: [
                 [/H'/, { token: 'string.quote', bracket: '@open', next: '@string' }],
                 [/h'/, { token: 'string.quote', bracket: '@open', next: '@string' }],
-                [/'/, { token: 'string.quote', bracket: '@open', next: '@string' }]
+                [/'/, { token: 'string.quote', bracket: '@open', next: '@string' }],
             ],
             string: [
                 [/[^']+/, 'string'],
                 [/''/, 'string'],
-                [/'/, { token: 'string.quote', bracket: '@close', next: '@pop' }]
+                [/'/, { token: 'string.quote', bracket: '@close', next: '@pop' }],
             ],
             dqstrings: [
                 [/H"/, { token: 'string.quote', bracket: '@open', next: '@dqstring' }],
                 [/h"/, { token: 'string.quote', bracket: '@open', next: '@dqstring' }],
-                [/"/, { token: 'string.quote', bracket: '@open', next: '@dqstring' }]
+                [/"/, { token: 'string.quote', bracket: '@open', next: '@dqstring' }],
             ],
             dqstring: [
                 [/[^"]+/, 'string'],
                 [/""/, 'string'],
-                [/"/, { token: 'string.quote', bracket: '@close', next: '@pop' }]
+                [/"/, { token: 'string.quote', bracket: '@close', next: '@pop' }],
             ],
-            literals: [[/datetime\(\d{4}-\d{2}-\d{2}(\s+\d{2}:\d{2}(:\d{2}(\.\d{0,3})?)?)?\)/, 'number'],
+            literals: [
+                [/datetime\(\d{4}-\d{2}-\d{2}(\s+\d{2}:\d{2}(:\d{2}(\.\d{0,3})?)?)?\)/, 'number'],
                 [/time\((\d+(s(ec(onds?)?)?|m(in(utes?)?)?|h(ours?)?|d(ays?)?)|(\s*(('[^']+')|("[^"]+"))\s*))\)/, 'number'],
                 [/guid\([\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}\)/, 'number'],
-                [/typeof\((int|string|date|datetime|time|long|real|boolean|bool)\)/, 'number']]
-        }
+                [/typeof\((int|string|date|datetime|time|long|real|boolean|bool)\)/, 'number'],
+            ],
+        },
     };
 });
 
@@ -2260,7 +2311,6 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
     var Uri = monaco.Uri;
     var Range = monaco.Range;
     var ClassificationKind = Kusto.Language.Editor.ClassificationKind;
-    // --- diagnostics ---
     var DiagnosticsAdapter = /** @class */ (function () {
         function DiagnosticsAdapter(_monacoInstance, _languageId, _worker, defaults, onSchemaChange) {
             var _this = this;
@@ -2403,9 +2453,9 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
                     }
                     else {
                         // Add custom popup for syntax error: icon, header and message as markdown
-                        var header = syntaxErrorAsMarkDown.header ? "**" + syntaxErrorAsMarkDown.header + "** \n\n" : '';
-                        var icon = syntaxErrorAsMarkDown.icon ? "![](" + syntaxErrorAsMarkDown.icon + ")" : '';
-                        var popupErrorHoverHeaderMessage_1 = icon + " " + header;
+                        var header = syntaxErrorAsMarkDown.header ? "**".concat(syntaxErrorAsMarkDown.header, "** \n\n") : '';
+                        var icon = syntaxErrorAsMarkDown.icon ? "![](".concat(syntaxErrorAsMarkDown.icon, ")") : '';
+                        var popupErrorHoverHeaderMessage_1 = "".concat(icon, " ").concat(header);
                         var newDecorations = markers.map(function (marker) {
                             return {
                                 range: {
@@ -2432,8 +2482,7 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
                                 },
                             };
                         });
-                        var oldMarkers = monaco.editor
-                            .getModelMarkers({
+                        var oldMarkers = monaco.editor.getModelMarkers({
                             owner: languageId,
                             resource: resource,
                         });
@@ -2739,7 +2788,7 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
         var classificationColorTriplets = getClassificationColorTriplets();
         var cssInnerHtml = classificationColorTriplets
             .map(function (pair) {
-            return ".vs ." + pair.classification + " {color: #" + pair.colorLight + ";} .vs-dark ." + pair.classification + " {color: #" + pair.colorDark + ";}";
+            return ".vs .".concat(pair.classification, " {color: #").concat(pair.colorLight, ";} .vs-dark .").concat(pair.classification, " {color: #").concat(pair.colorDark, ";}");
         })
             .join('\n');
         return cssInnerHtml;
@@ -2840,7 +2889,7 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
             text: textEdit.newText,
         };
     }
-    var DOCS_BASE_URL = "https://learn.microsoft.com/azure/data-explorer/kusto/query";
+    var DOCS_BASE_URL = 'https://learn.microsoft.com/azure/data-explorer/kusto/query';
     function formatDocLink(docString) {
         // If the docString is empty, we want to return undefined to prevent an empty documentation popup.
         if (!docString) {
@@ -2850,9 +2899,11 @@ define('vs/language/kusto/languageFeatures',["require", "exports", "vscode-langu
         var urisProxy = new Proxy(target, {
             get: function (_target, prop, _receiver) {
                 // The link comes with a postfix of ".md" that we want to remove
-                var linkWithoutPostfix = prop.toString().replace(".md", "");
+                var linkWithoutPostfix = prop.toString().replace('.md', '');
                 // Sometimes we get the link as a full URL. For example in the main doc link of the item
-                var fullURL = linkWithoutPostfix.startsWith("https") ? linkWithoutPostfix : DOCS_BASE_URL + "/" + linkWithoutPostfix;
+                var fullURL = linkWithoutPostfix.startsWith('https')
+                    ? linkWithoutPostfix
+                    : "".concat(DOCS_BASE_URL, "/").concat(linkWithoutPostfix);
                 return monaco.Uri.parse(fullURL);
             },
         });
@@ -3194,7 +3245,7 @@ define('vs/language/kusto/kustoMode',["require", "exports", "./workerManager", "
             for (var _i = 1; _i < arguments.length; _i++) {
                 more[_i - 1] = arguments[_i];
             }
-            var augmentedSetSchema = function (schema, worker, globalParameters) {
+            var augmentedSetSchema = function (schema, worker, globalScalarParameters, globalTabularParameters) {
                 var workerPromise = worker.setSchema(schema);
                 workerPromise.then(function () {
                     onSchemaChange.fire(schema);
@@ -3202,10 +3253,13 @@ define('vs/language/kusto/kustoMode',["require", "exports", "./workerManager", "
             };
             var worker = client.getLanguageServiceWorker.apply(client, [first].concat(more));
             return worker.then(function (worker) {
-                return (__assign(__assign({}, worker), { setSchema: function (schema) { return augmentedSetSchema(schema, worker); }, setSchemaFromShowSchema: function (schema, connection, database, globalParameters) {
+                return (__assign(__assign({}, worker), { setSchema: function (schema) { return augmentedSetSchema(schema, worker); }, setSchemaFromShowSchema: function (schema, connection, database, globalScalarParameters, globalTabularParameters) {
                         worker
                             .normalizeSchema(schema, connection, database)
-                            .then(function (schema) { return (globalParameters ? __assign(__assign({}, schema), { globalParameters: globalParameters }) : schema); })
+                            .then(function (schema) {
+                            return globalScalarParameters
+                                ? __assign(__assign({}, schema), { globalScalarParameters: globalScalarParameters, globalTabularParameters: globalTabularParameters }) : schema;
+                        })
                             .then(function (normalized) { return augmentedSetSchema(normalized, worker); });
                     } }));
             });