@kusto/monaco-kusto 5.3.10 → 5.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "5.3.10",
+    "version": "5.3.12",
     "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);
             },
         });
@@ -3205,7 +3256,10 @@ define('vs/language/kusto/kustoMode',["require", "exports", "./workerManager", "
                 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 (globalScalarParameters ? __assign(__assign({}, schema), { globalScalarParameters: globalScalarParameters, globalTabularParameters: globalTabularParameters }) : schema); })
+                            .then(function (schema) {
+                            return globalScalarParameters
+                                ? __assign(__assign({}, schema), { globalScalarParameters: globalScalarParameters, globalTabularParameters: globalTabularParameters }) : schema;
+                        })
                             .then(function (normalized) { return augmentedSetSchema(normalized, worker); });
                     } }));
             });

package/release/dev/kustoWorker.js

@@ -23,9 +23,10 @@ define('vs/language/kusto/languageService/schema',["require", "exports"], functi
         'Newtonsoft.Json.Linq.JObject': 'dynamic',
         'Newtonsoft.Json.Linq.JToken': 'dynamic',
         'System.Object': 'dynamic',
-        'System.Data.SqlTypes.SqlDecimal': 'decimal'
+        'System.Data.SqlTypes.SqlDecimal': 'decimal',
     };
-    exports.getCslTypeNameFromClrType = function (clrType) { return dotnetTypeToKustoType[clrType] || clrType; };
+    var getCslTypeNameFromClrType = function (clrType) { return dotnetTypeToKustoType[clrType] || clrType; };
+    exports.getCslTypeNameFromClrType = getCslTypeNameFromClrType;
     var kustoTypeToEntityDataType = {
         object: 'Object',
         bool: 'Boolean',
@@ -42,28 +43,32 @@ define('vs/language/kusto/languageService/schema',["require", "exports"], functi
         datetime: 'DateTime',
         string: 'String',
         dynamic: 'Dynamic',
-        timespan: 'TimeSpan'
+        timespan: 'TimeSpan',
     };
-    exports.getEntityDataTypeFromCslType = function (cslType) { return kustoTypeToEntityDataType[cslType] || cslType; };
-    exports.getCallName = function (fn) {
-        return fn.name + "(" + fn.inputParameters.map(function (p) { return "{" + p.name + "}"; }).join(',') + ")";
+    var getEntityDataTypeFromCslType = function (cslType) { return kustoTypeToEntityDataType[cslType] || cslType; };
+    exports.getEntityDataTypeFromCslType = getEntityDataTypeFromCslType;
+    var getCallName = function (fn) {
+        return "".concat(fn.name, "(").concat(fn.inputParameters.map(function (p) { return "{".concat(p.name, "}"); }).join(','), ")");
     };
-    exports.getExpression = function (fn) {
-        return "let " + fn.name + " = " + exports.getInputParametersAsCslString(fn.inputParameters) + " " + fn.body;
+    exports.getCallName = getCallName;
+    var getExpression = function (fn) {
+        return "let ".concat(fn.name, " = ").concat((0, exports.getInputParametersAsCslString)(fn.inputParameters), " ").concat(fn.body);
     };
-    exports.getInputParametersAsCslString = function (inputParameters) {
-        return "(" + inputParameters.map(function (inputParameter) { return getInputParameterAsCslString(inputParameter); }).join(',') + ")";
+    exports.getExpression = getExpression;
+    var getInputParametersAsCslString = function (inputParameters) {
+        return "(".concat(inputParameters.map(function (inputParameter) { return getInputParameterAsCslString(inputParameter); }).join(','), ")");
     };
+    exports.getInputParametersAsCslString = getInputParametersAsCslString;
     var getInputParameterAsCslString = function (inputParameter) {
         // If this is a tabular parameter
         if (inputParameter.columns && inputParameter.columns.length > 0) {
             var attributesAsString = inputParameter.columns
-                .map(function (col) { return col.name + ":" + (col.cslType || exports.getCslTypeNameFromClrType(col.type)); })
+                .map(function (col) { return "".concat(col.name, ":").concat(col.cslType || (0, exports.getCslTypeNameFromClrType)(col.type)); })
                 .join(',');
-            return inputParameter.name + ":" + (attributesAsString === '' ? '*' : attributesAsString);
+            return "".concat(inputParameter.name, ":").concat(attributesAsString === '' ? '*' : attributesAsString);
         }
         else {
-            return inputParameter.name + ":" + (inputParameter.cslType || exports.getCslTypeNameFromClrType(inputParameter.type));
+            return "".concat(inputParameter.name, ":").concat(inputParameter.cslType || (0, exports.getCslTypeNameFromClrType)(inputParameter.type));
         }
     };
 });
@@ -6656,12 +6661,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 define('vs/language/kusto/languageService/kustoLanguageService',["require", "exports", "./schema", "vscode-languageserver-types", "xregexp", "./schema"], function (require, exports, s, ls, XRegExp, schema_1) {
     "use strict";
@@ -6768,7 +6775,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             /**
              * Taken from:
              * https://msazure.visualstudio.com/One/_git/Azure-Kusto-Service?path=/Src/Tools/Kusto.Explorer.Control/QueryEditors/KustoScriptEditor/KustoScriptEditorControl2.xaml.cs&version=GBdev&line=2075&lineEnd=2075&lineStartColumn=9&lineEndColumn=77&lineStyle=plain&_a=contents
-            */
+             */
             this._toOptionKind = (_a = {},
                 _a[k2.CompletionKind.AggregateFunction] = k.OptionKind.FunctionAggregation,
                 _a[k2.CompletionKind.BuiltInFunction] = k.OptionKind.FunctionScalar,
@@ -6915,7 +6922,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             this._newlineAppendPipePolicy.Text = '\n| ';
         }
         KustoLanguageService.prototype.createDatabaseUniqueName = function (clusterName, databaseName) {
-            return clusterName + "_" + databaseName;
+            return "".concat(clusterName, "_").concat(databaseName);
         };
         Object.defineProperty(KustoLanguageService.prototype, "_kustoJsSchemaV2", {
             /**
@@ -6962,20 +6969,20 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
          */
         KustoLanguageService.prototype.debugGlobalState = function (globals) {
             // iterate over clusters
-            console.log("globals.Clusters.Count: " + globals.Clusters.Count);
+            console.log("globals.Clusters.Count: ".concat(globals.Clusters.Count));
             for (var i = 0; i < globals.Clusters.Count; i++) {
                 var cluster = globals.Clusters.getItem(i);
-                console.log("cluster: " + cluster.Name);
+                console.log("cluster: ".concat(cluster.Name));
                 // iterate over databases
-                console.log("cluster.Databases.Count: " + cluster.Databases.Count);
+                console.log("cluster.Databases.Count: ".concat(cluster.Databases.Count));
                 for (var i2 = 0; i2 < cluster.Databases.Count; i2++) {
                     var database = cluster.Databases.getItem(i2);
-                    console.log("cluster.database: [" + cluster.Name + "].[" + database.Name + "]");
+                    console.log("cluster.database: [".concat(cluster.Name, "].[").concat(database.Name, "]"));
                     // iterate over tables
-                    console.log("cluster.Databases.Tables.Count: " + database.Tables.Count);
+                    console.log("cluster.Databases.Tables.Count: ".concat(database.Tables.Count));
                     for (var i3 = 0; i3 < database.Tables.Count; i3++) {
                         var table = database.Tables.getItem(i3);
-                        console.log("cluster.database.table: [" + cluster.Name + "].[" + database.Name + "].[" + table.Name + "]");
+                        console.log("cluster.database.table: [".concat(cluster.Name, "].[").concat(database.Name, "].[").concat(table.Name, "]"));
                     }
                 }
             }
@@ -6984,7 +6991,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
          * Prepending the doc of the actual topic at the top
          */
         KustoLanguageService.prototype.formatHelpTopic = function (helpTopic) {
-            return "**" + helpTopic.Name + " [(view online)](" + helpTopic.Url + ")**\n\n" + helpTopic.LongDescription;
+            return "**".concat(helpTopic.Name, " [(view online)](").concat(helpTopic.Url, ")**\n\n").concat(helpTopic.LongDescription);
         };
         KustoLanguageService.prototype.doCompleteV2 = function (document, position) {
             var _this = this;
@@ -7026,7 +7033,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                     ? {
                         // Need to escape dollar sign since it is used as a placeholder in snippet.
                         // Usually dollar sign is not a valid character in a function name, but grafana uses macros that start with dollars.
-                        textToInsert: kItem.EditText.replace('$', '\\$') + "$0" + kItem.AfterText,
+                        textToInsert: "".concat(kItem.EditText.replace('$', '\\$'), "$0").concat(kItem.AfterText),
                         format: ls.InsertTextFormat.Snippet,
                     }
                     : {
@@ -7430,13 +7437,14 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
         KustoLanguageService.prototype.setSchema = function (schema) {
             var _this = this;
             this._schema = schema;
-            if (this._languageSettings.useIntellisenseV2) {
-                var kustoJsSchemaV2 = schema && schema.clusterType === 'Engine' ? this.convertToKustoJsSchemaV2(schema) : null;
+            // We support intellisenseV2 only if the clusterType is "Engine", even if the setting is enabled
+            if (this._languageSettings.useIntellisenseV2 && schema && schema.clusterType === 'Engine') {
+                var kustoJsSchemaV2 = this.convertToKustoJsSchemaV2(schema);
                 this._kustoJsSchemaV2 = kustoJsSchemaV2;
                 this._script = undefined;
                 this._parsePropertiesV2 = undefined;
             }
-            // since V2 doesn't support control commands, we're initializing V1 intellisense for both cases and we'll going to use V1 intellisense for contorl commands.
+            // since V2 doesn't support control commands, we're initializing V1 intellisense for both cases and we'll going to use V1 intellisense for control commands.
             return new Promise(function (resolve, reject) {
                 var kustoJsSchema = schema ? KustoLanguageService.convertToKustoJsSchema(schema) : undefined;
                 _this._kustoJsSchema = kustoJsSchema;
@@ -7451,8 +7459,10 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             this._schema.globalScalarParameters = scalarParameters;
             this._schema.globalTabularParameters = tabularParameters;
             var scalarSymbols = scalarParameters.map(function (param) { return KustoLanguageService.createParameterSymbol(param); });
-            var tabularSymbols = tabularParameters.map(function (param) { return KustoLanguageService.createTabularParameterSymbol(param); });
-            this._kustoJsSchemaV2 = this._kustoJsSchemaV2.WithParameters(KustoLanguageService.toBridgeList(__spreadArrays(scalarSymbols, tabularSymbols)));
+            var tabularSymbols = tabularParameters.map(function (param) {
+                return KustoLanguageService.createTabularParameterSymbol(param);
+            });
+            this._kustoJsSchemaV2 = this._kustoJsSchemaV2.WithParameters(KustoLanguageService.toBridgeList(__spreadArray(__spreadArray([], scalarSymbols, true), tabularSymbols, true)));
             return Promise.resolve(undefined);
         };
         /**
@@ -8046,7 +8056,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                             table.columns.forEach(function (column) {
                                 var kColumn = new k.KustoIntelliSenseColumnEntity();
                                 kColumn.Name = column.name;
-                                kColumn.TypeCode = k.EntityDataType[schema_1.getEntityDataTypeFromCslType(column.type)];
+                                kColumn.TypeCode = k.EntityDataType[(0, schema_1.getEntityDataTypeFromCslType)(column.type)];
                                 cols.push(kColumn);
                             });
                             kTable.Columns = new Bridge.ArrayEnumerable(cols);
@@ -8099,8 +8109,8 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
          * @param params scalar parameters
          */
         KustoLanguageService.scalarParametersToSignature = function (params) {
-            var signatureWithoutParens = params.map(function (param) { return param.name + ": " + param.cslType; }).join(', ');
-            return "(" + signatureWithoutParens + ")";
+            var signatureWithoutParens = params.map(function (param) { return "".concat(param.name, ": ").concat(param.cslType); }).join(', ');
+            return "(".concat(signatureWithoutParens, ")");
         };
         /**
          * Returns something like '(x: string, T: (y: int))'
@@ -8112,14 +8122,14 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 .map(function (param) {
                 if (param.columns) {
                     var tableSignature = _this.scalarParametersToSignature(param.columns);
-                    return param.name + ": " + tableSignature;
+                    return "".concat(param.name, ": ").concat(tableSignature);
                 }
                 else {
-                    return param.name + ": " + param.cslType;
+                    return "".concat(param.name, ": ").concat(param.cslType);
                 }
             })
                 .join(', ');
-            return "(" + signatureWithoutParens + ")";
+            return "(".concat(signatureWithoutParens, ")");
         };
         /**
          * converts a function definition to a let statement.
@@ -8127,13 +8137,13 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
          */
         KustoLanguageService.toLetStatement = function (fn) {
             var signature = this.inputParameterToSignature(fn.inputParameters);
-            return "let " + fn.name + " = " + signature + " " + fn.body;
+            return "let ".concat(fn.name, " = ").concat(signature, " ").concat(fn.body);
         };
         KustoLanguageService.createColumnSymbol = function (col) {
-            return new sym.ColumnSymbol(col.name, sym.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(col.type)), col.docstring, null, null, col.examples ? KustoLanguageService.toBridgeList(col.examples) : null);
+            return new sym.ColumnSymbol(col.name, sym.ScalarTypes.GetSymbol((0, schema_1.getCslTypeNameFromClrType)(col.type)), col.docstring, null, null, col.examples ? KustoLanguageService.toBridgeList(col.examples) : null);
         };
         KustoLanguageService.createParameterSymbol = function (param) {
-            var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(param.type));
+            var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol((0, schema_1.getCslTypeNameFromClrType)(param.type));
             return new sym.ParameterSymbol(param.name, paramSymbol, null);
         };
         KustoLanguageService.createTabularParameterSymbol = function (param) {
@@ -8143,7 +8153,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
         };
         KustoLanguageService.createParameter = function (param) {
             if (!param.columns) {
-                var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(param.type));
+                var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol((0, schema_1.getCslTypeNameFromClrType)(param.type));
                 var expression = param.cslDefaultValue && typeof param.cslDefaultValue === 'string'
                     ? parsing.QueryParser.ParseLiteral$1(param.cslDefaultValue)
                     : undefined;
@@ -8235,11 +8245,15 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 globalState = globalState.WithDatabase(databaseInContext);
             }
             // Inject global scalar parameters to global scope.
-            var scalarParameters = ((_a = schema.globalScalarParameters) !== null && _a !== void 0 ? _a : []).map(function (param) { return KustoLanguageService.createParameterSymbol(param); });
+            var scalarParameters = ((_a = schema.globalScalarParameters) !== null && _a !== void 0 ? _a : []).map(function (param) {
+                return KustoLanguageService.createParameterSymbol(param);
+            });
             // Inject global tabular parameters to global scope.
-            var tabularParameters = ((_b = schema.globalTabularParameters) !== null && _b !== void 0 ? _b : []).map(function (param) { return KustoLanguageService.createTabularParameterSymbol(param); });
+            var tabularParameters = ((_b = schema.globalTabularParameters) !== null && _b !== void 0 ? _b : []).map(function (param) {
+                return KustoLanguageService.createTabularParameterSymbol(param);
+            });
             if (tabularParameters.length || scalarParameters.length) {
-                globalState = globalState.WithParameters(KustoLanguageService.toBridgeList(__spreadArrays(scalarParameters, tabularParameters)));
+                globalState = globalState.WithParameters(KustoLanguageService.toBridgeList(__spreadArray(__spreadArray([], scalarParameters, true), tabularParameters, true)));
             }
             return globalState;
         };
@@ -8276,7 +8290,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
          */
         KustoLanguageService.prototype.getSortText = function (order) {
             if (order <= 0) {
-                throw new RangeError("order should be a number >= 1. instead got " + order);
+                throw new RangeError("order should be a number >= 1. instead got ".concat(order));
             }
             var sortText = '';
             var numCharacters = 26; // "z" - "a" + 1;
@@ -8481,7 +8495,7 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.addClusterToSchema = function (uri, clusterName, databasesNames) {
             var document = this._getTextDocument(uri);
             if (!document) {
-                console.error("addClusterToSchema: document is " + document + ". uri is " + uri);
+                console.error("addClusterToSchema: document is ".concat(document, ". uri is ").concat(uri));
                 return Promise.resolve();
             }
             return this._languageService.addClusterToSchema(document, clusterName, databasesNames);
@@ -8489,7 +8503,7 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.addDatabaseToSchema = function (uri, clusterName, databaseSchema) {
             var document = this._getTextDocument(uri);
             if (!document) {
-                console.error("addDatabaseToSchema: document is " + document + ". uri is " + uri);
+                console.error("addDatabaseToSchema: document is ".concat(document, ". uri is ").concat(uri));
                 return Promise.resolve();
             }
             return this._languageService.addDatabaseToSchema(document, clusterName, databaseSchema);
@@ -8506,7 +8520,7 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.getCommandInContext = function (uri, cursorOffset) {
             var document = this._getTextDocument(uri);
             if (!document) {
-                console.error("getCommandInContext: document is " + document + ". uri is " + uri);
+                console.error("getCommandInContext: document is ".concat(document, ". uri is ").concat(uri));
                 return null;
             }
             var commandInContext = this._languageService.getCommandInContext(document, cursorOffset);
@@ -8518,7 +8532,7 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.getQueryParams = function (uri, cursorOffset) {
             var document = this._getTextDocument(uri);
             if (!document) {
-                console.error("getQueryParams: document is " + document + ". uri is " + uri);
+                console.error("getQueryParams: document is ".concat(document, ". uri is ").concat(uri));
                 return null;
             }
             var queryParams = this._languageService.getQueryParams(document, cursorOffset);
@@ -8530,7 +8544,7 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.getGlobalParams = function (uri) {
             var document = this._getTextDocument(uri);
             if (!document) {
-                console.error("getGLobalParams: document is " + document + ". uri is " + uri);
+                console.error("getGLobalParams: document is ".concat(document, ". uri is ").concat(uri));
                 return null;
             }
             var globalParams = this._languageService.getGlobalParams(document);
@@ -8542,7 +8556,7 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.getReferencedGlobalParams = function (uri, cursorOffest) {
             var document = this._getTextDocument(uri);
             if (!document) {
-                console.error("getReferencedGlobalParams: document is " + document + ". uri is " + uri);
+                console.error("getReferencedGlobalParams: document is ".concat(document, ". uri is ").concat(uri));
                 return null;
             }
             var referencedParams = this._languageService.getReferencedGlobalParams(document, cursorOffest);
@@ -8554,7 +8568,7 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.getRenderInfo = function (uri, cursorOffset) {
             var document = this._getTextDocument(uri);
             if (!document) {
-                console.error("getRenderInfo: document is " + document + ". uri is " + uri);
+                console.error("getRenderInfo: document is ".concat(document, ". uri is ").concat(uri));
             }
             return this._languageService.getRenderInfo(document, cursorOffset).then(function (result) {
                 if (!result) {
@@ -8572,7 +8586,7 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.getCommandAndLocationInContext = function (uri, cursorOffset) {
             var document = this._getTextDocument(uri);
             if (!document) {
-                console.error("getCommandAndLocationInContext: document is " + document + ". uri is " + uri);
+                console.error("getCommandAndLocationInContext: document is ".concat(document, ". uri is ").concat(uri));
                 return Promise.resolve(null);
             }
             return this._languageService.getCommandAndLocationInContext(document, cursorOffset).then(function (result) {
@@ -8591,7 +8605,7 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.getCommandsInDocument = function (uri) {
             var document = this._getTextDocument(uri);
             if (!document) {
-                console.error("getCommandInDocument: document is " + document + ". uri is " + uri);
+                console.error("getCommandInDocument: document is ".concat(document, ". uri is ").concat(uri));
                 return null;
             }
             return this._languageService.getCommandsInDocument(document);