@kusto/monaco-kusto 10.0.6 → 10.0.8

package/release/dev/kustoMode.js

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 10.0.6(2d98fbb291999138c08e16b68891b9e1c28dd4bf)
+ * monaco-kusto version: 10.0.8(134ff03184264a9900737e4b5cf93f69540e1c8e)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './main-f70a1720'], (function (exports, monaco, main) { 'use strict';
+define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './main-5c133770'], (function (exports, monaco, main) { 'use strict';
 
     function _interopNamespaceDefault(e) {
         var n = Object.create(null);

package/release/dev/kustoWorker.js

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 10.0.6(2d98fbb291999138c08e16b68891b9e1c28dd4bf)
+ * monaco-kusto version: 10.0.8(134ff03184264a9900737e4b5cf93f69540e1c8e)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema-43c4cc5e'], (function (exports, main, schema) { 'use strict';
+define('vs/language/kusto/kustoWorker', ['exports', './main-5c133770', './schema-5549fea4'], (function (exports, main, schema) { 'use strict';
 
     function _slicedToArray$2(arr, i) { return _arrayWithHoles$2(arr) || _iterableToArrayLimit$2(arr, i) || _unsupportedIterableToArray$3(arr, i) || _nonIterableRest$2(); }
     function _nonIterableRest$2() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -4311,7 +4311,6 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
       }, {
         key: "setSchema",
         value: function setSchema(schema) {
-          var _this7 = this;
           this._schema = schema;
           // We support intellisenseV2 only if the clusterType is "Engine", even if the setting is enabled
           if (this._languageSettings.useIntellisenseV2 && schema && schema.clusterType === 'Engine') {
@@ -4322,12 +4321,11 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
           }
 
           // 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;
-            _this7._kustoJsSchema = kustoJsSchema;
-            _this7.createRulesProvider(kustoJsSchema, schema.clusterType);
-            resolve(undefined);
-          });
+
+          var kustoJsSchema = schema ? KustoLanguageService.convertToKustoJsSchema(schema) : undefined;
+          this._kustoJsSchema = kustoJsSchema;
+          this.createRulesProvider(kustoJsSchema, schema.clusterType);
+          return Promise.resolve();
         }
       }, {
         key: "setParameters",
@@ -4346,6 +4344,12 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
           });
           this._kustoJsSchemaV2 = this._kustoJsSchemaV2.WithParameters(KustoLanguageService.toBridgeList([].concat(_toConsumableArray(scalarSymbols), _toConsumableArray(tabularSymbols))));
           this._script = (_this$_script = this._script) === null || _this$_script === void 0 ? void 0 : _this$_script.WithGlobals(this._kustoJsSchemaV2);
+
+          // Set parameters is only working with the below code. It didn't used to need this, why does it now?!?
+          // Copy+pasted from setSchema
+          var kustoJsSchema = KustoLanguageService.convertToKustoJsSchema(this._schema);
+          this._kustoJsSchema = kustoJsSchema;
+          this.createRulesProvider(kustoJsSchema, this._schema.clusterType);
           return Promise.resolve(undefined);
         }
 
@@ -4361,13 +4365,11 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
       }, {
         key: "setSchemaFromShowSchema",
         value: function setSchemaFromShowSchema(schema, clusterConnectionString, databaseInContextName, globalScalarParameters, globalTabularParameters, databaseInContextAlternateName) {
-          var _this8 = this;
-          return this.normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName).then(function (normalized) {
-            return _this8.setSchema(_objectSpread(_objectSpread({}, normalized), {}, {
-              globalScalarParameters: globalScalarParameters,
-              globalTabularParameters: globalTabularParameters
-            }));
-          });
+          var normalized = this._normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName);
+          return this.setSchema(_objectSpread(_objectSpread({}, normalized), {}, {
+            globalScalarParameters: globalScalarParameters,
+            globalTabularParameters: globalTabularParameters
+          }));
         }
 
         /**
@@ -4378,8 +4380,8 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
          * @param databaseInContextAlternateName database in context alternate name
          */
       }, {
-        key: "normalizeSchema",
-        value: function normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName) {
+        key: "_normalizeSchema",
+        value: function _normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName) {
           var databases = Object.keys(schema.Databases).map(function (key) {
             return schema.Databases[key];
           }).map(function (_ref7) {
@@ -4469,7 +4471,7 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
               })
             };
           });
-          var result = {
+          return {
             clusterType: 'Engine',
             cluster: {
               connectionString: clusterConnectionString,
@@ -4479,7 +4481,19 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
               return db.name === databaseInContextName;
             })[0]
           };
-          return Promise.resolve(result);
+        }
+
+        /**
+         * Converts the result of .show schema as json to a normalized schema used by kusto language service.
+         * @param schema result of show schema
+         * @param clusterConnectionString cluster connection string`
+         * @param databaseInContextName database in context name
+         * @param databaseInContextAlternateName database in context alternate name
+         */
+      }, {
+        key: "normalizeSchema",
+        value: function normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName) {
+          return Promise.resolve(this._normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName));
         }
       }, {
         key: "getSchema",
@@ -4585,7 +4599,7 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
       }, {
         key: "getFormattedCommandsInDocumentV2",
         value: function getFormattedCommandsInDocumentV2(document, rangeStart, rangeEnd) {
-          var _this9 = this;
+          var _this7 = this;
           var script = this.parseDocumentV2(document);
           var commands = this.toArray(script.Blocks).filter(function (command) {
             if (!command.Text || command.Text.trim() == '') return false;
@@ -4611,9 +4625,9 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
             };
           }
           var formattedCommands = commands.map(function (command) {
-            var _formatterOptions$ind, _this9$toPlacementSty;
-            var formatterOptions = _this9._languageSettings.formatter;
-            var formatter = Kusto.Language.Editor.FormattingOptions.Default.WithIndentationSize((_formatterOptions$ind = formatterOptions === null || formatterOptions === void 0 ? void 0 : formatterOptions.indentationSize) !== null && _formatterOptions$ind !== void 0 ? _formatterOptions$ind : 4).WithInsertMissingTokens(false).WithPipeOperatorStyle((_this9$toPlacementSty = _this9.toPlacementStyle(formatterOptions === null || formatterOptions === void 0 ? void 0 : formatterOptions.pipeOperatorStyle)) !== null && _this9$toPlacementSty !== void 0 ? _this9$toPlacementSty : k2.PlacementStyle.Smart).WithSemicolonStyle(Kusto.Language.Editor.PlacementStyle.None).WithBrackettingStyle(k2.BrackettingStyle.Diagonal);
+            var _formatterOptions$ind, _this7$toPlacementSty;
+            var formatterOptions = _this7._languageSettings.formatter;
+            var formatter = Kusto.Language.Editor.FormattingOptions.Default.WithIndentationSize((_formatterOptions$ind = formatterOptions === null || formatterOptions === void 0 ? void 0 : formatterOptions.indentationSize) !== null && _formatterOptions$ind !== void 0 ? _formatterOptions$ind : 4).WithInsertMissingTokens(false).WithPipeOperatorStyle((_this7$toPlacementSty = _this7.toPlacementStyle(formatterOptions === null || formatterOptions === void 0 ? void 0 : formatterOptions.pipeOperatorStyle)) !== null && _this7$toPlacementSty !== void 0 ? _this7$toPlacementSty : k2.PlacementStyle.Smart).WithSemicolonStyle(Kusto.Language.Editor.PlacementStyle.None).WithBrackettingStyle(k2.BrackettingStyle.Diagonal);
             if (rangeStart == null || rangeEnd == null || rangeStart === command.Start && rangeEnd === command.End) {
               var result = command.Service.GetFormattedText(formatter);
               return result.Text;
@@ -4744,7 +4758,7 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
       }, {
         key: "getRenderInfo",
         value: function getRenderInfo(document, cursorOffset) {
-          var _this10 = this;
+          var _this8 = this;
           var parsedAndAnalyzed = this.parseAndAnalyze(document, cursorOffset);
           if (!parsedAndAnalyzed) {
             return Promise.resolve(undefined);
@@ -4784,7 +4798,7 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
                 break;
               case 'ycolumns':
               case 'anomalycolumns':
-                var nameNodes = _this10.toArray(property.Element$1.Expression.Names);
+                var nameNodes = _this8.toArray(property.Element$1.Expression.Names);
                 var values = nameNodes.map(function (nameNode) {
                   return nameNode.Element$1.SimpleName;
                 });
@@ -5064,14 +5078,14 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
       }, {
         key: "getClassificationsFromParseResult",
         value: function getClassificationsFromParseResult() {
-          var _this11 = this;
+          var _this9 = this;
           var offset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
           var classifications = this.toArray(this._parser.Results).map(function (command) {
-            return _this11.toArray(command.Tokens);
+            return _this9.toArray(command.Tokens);
           }).reduce(function (prev, curr) {
             return prev.concat(curr);
           }, []).map(function (cslCommandToken) {
-            var range = new k2.ClassifiedRange(_this11.tokenKindToClassificationKind(cslCommandToken.TokenKind), cslCommandToken.AbsoluteStart + offset, cslCommandToken.Length);
+            var range = new k2.ClassifiedRange(_this9.tokenKindToClassificationKind(cslCommandToken.TokenKind), cslCommandToken.AbsoluteStart + offset, cslCommandToken.Length);
             return range;
           });
           return classifications;
@@ -5452,10 +5466,10 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-f70a1720', './schema
       }, {
         key: "inputParameterToSignature",
         value: function inputParameterToSignature(params) {
-          var _this12 = this;
+          var _this10 = this;
           var signatureWithoutParens = params.map(function (param) {
             if (param.columns) {
-              var tableSignature = _this12.scalarParametersToSignature(param.columns);
+              var tableSignature = _this10.scalarParametersToSignature(param.columns);
               return "".concat(param.name, ": ").concat(tableSignature);
             } else {
               return "".concat(param.name, ": ").concat(param.cslType);

package/release/dev/{main-f70a1720.js → main-5c133770.js}

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 10.0.6(2d98fbb291999138c08e16b68891b9e1c28dd4bf)
+ * monaco-kusto version: 10.0.8(134ff03184264a9900737e4b5cf93f69540e1c8e)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/main-f70a1720', ['exports'], (function (exports) { 'use strict';
+define('vs/language/kusto/main-5c133770', ['exports'], (function (exports) { 'use strict';
 
     /* --------------------------------------------------------------------------------------------
      * Copyright (c) Microsoft Corporation. All rights reserved.

package/release/dev/monaco.contribution.js

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 10.0.6(2d98fbb291999138c08e16b68891b9e1c28dd4bf)
+ * monaco-kusto version: 10.0.8(134ff03184264a9900737e4b5cf93f69540e1c8e)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/editor/editor.main', './schema-43c4cc5e'], (function (require, exports, monaco, schema) { 'use strict';
+define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/editor/editor.main', './schema-5549fea4'], (function (require, exports, monaco, schema) { 'use strict';
 
     function _interopNamespaceDefault(e) {
         var n = Object.create(null);

package/release/dev/{schema-43c4cc5e.js → schema-5549fea4.js}

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 10.0.6(2d98fbb291999138c08e16b68891b9e1c28dd4bf)
+ * monaco-kusto version: 10.0.8(134ff03184264a9900737e4b5cf93f69540e1c8e)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/schema-43c4cc5e', ['exports'], (function (exports) { 'use strict';
+define('vs/language/kusto/schema-5549fea4', ['exports'], (function (exports) { 'use strict';
 
     // Definition of schema object in the context of language services. This model is exposed to consumers of this library.
 

package/release/esm/kusto.worker.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 10.0.6(2d98fbb291999138c08e16b68891b9e1c28dd4bf)
+ * monaco-kusto version: 10.0.8(134ff03184264a9900737e4b5cf93f69540e1c8e)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
@@ -8,7 +8,7 @@
 import * as worker from 'monaco-editor/esm/vs/editor/editor.worker';
 import * as ls from 'vscode-languageserver-types';
 import XRegExp from 'xregexp';
-import { d as getEntityDataTypeFromCslType, a as getCallName, b as getExpression, g as getCslTypeNameFromClrType } from './schema-fbf2f106.js';
+import { d as getEntityDataTypeFromCslType, a as getCallName, b as getExpression, g as getCslTypeNameFromClrType } from './schema-0961786c.js';
 import '@kusto/language-service/bridge.min';
 import '@kusto/language-service/Kusto.JavaScript.Client.min';
 import '@kusto/language-service/newtonsoft.json.min';
@@ -795,12 +795,11 @@ class KustoLanguageService {
     }
 
     // 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((resolve, reject) => {
-      const kustoJsSchema = schema ? KustoLanguageService.convertToKustoJsSchema(schema) : undefined;
-      this._kustoJsSchema = kustoJsSchema;
-      this.createRulesProvider(kustoJsSchema, schema.clusterType);
-      resolve(undefined);
-    });
+
+    const kustoJsSchema = schema ? KustoLanguageService.convertToKustoJsSchema(schema) : undefined;
+    this._kustoJsSchema = kustoJsSchema;
+    this.createRulesProvider(kustoJsSchema, schema.clusterType);
+    return Promise.resolve();
   }
   setParameters(scalarParameters, tabularParameters) {
     if (!this._languageSettings.useIntellisenseV2 || this._schema.clusterType !== 'Engine') {
@@ -812,6 +811,12 @@ class KustoLanguageService {
     const tabularSymbols = tabularParameters.map(param => KustoLanguageService.createTabularParameterSymbol(param));
     this._kustoJsSchemaV2 = this._kustoJsSchemaV2.WithParameters(KustoLanguageService.toBridgeList([...scalarSymbols, ...tabularSymbols]));
     this._script = this._script?.WithGlobals(this._kustoJsSchemaV2);
+
+    // Set parameters is only working with the below code. It didn't used to need this, why does it now?!?
+    // Copy+pasted from setSchema
+    const kustoJsSchema = KustoLanguageService.convertToKustoJsSchema(this._schema);
+    this._kustoJsSchema = kustoJsSchema;
+    this.createRulesProvider(kustoJsSchema, this._schema.clusterType);
     return Promise.resolve(undefined);
   }
 
@@ -825,11 +830,12 @@ class KustoLanguageService {
    * @param databaseInContextAlternateName alternate name of database in context
    */
   setSchemaFromShowSchema(schema, clusterConnectionString, databaseInContextName, globalScalarParameters, globalTabularParameters, databaseInContextAlternateName) {
-    return this.normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName).then(normalized => this.setSchema({
+    const normalized = this._normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName);
+    return this.setSchema({
       ...normalized,
       globalScalarParameters,
       globalTabularParameters
-    }));
+    });
   }
 
   /**
@@ -839,7 +845,7 @@ class KustoLanguageService {
    * @param databaseInContextName database in context name
    * @param databaseInContextAlternateName database in context alternate name
    */
-  normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName) {
+  _normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName) {
     const databases = Object.keys(schema.Databases).map(key => schema.Databases[key]).map(({
       Name,
       Tables,
@@ -901,7 +907,7 @@ class KustoLanguageService {
         }))
       }))
     }));
-    const result = {
+    return {
       clusterType: 'Engine',
       cluster: {
         connectionString: clusterConnectionString,
@@ -909,7 +915,17 @@ class KustoLanguageService {
       },
       database: databases.filter(db => db.name === databaseInContextName)[0]
     };
-    return Promise.resolve(result);
+  }
+
+  /**
+   * Converts the result of .show schema as json to a normalized schema used by kusto language service.
+   * @param schema result of show schema
+   * @param clusterConnectionString cluster connection string`
+   * @param databaseInContextName database in context name
+   * @param databaseInContextAlternateName database in context alternate name
+   */
+  normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName) {
+    return Promise.resolve(this._normalizeSchema(schema, clusterConnectionString, databaseInContextName, databaseInContextAlternateName));
   }
   getSchema() {
     return Promise.resolve(this._schema);