@kusto/monaco-kusto 6.1.1 → 6.2.0

package/README.md

@@ -23,7 +23,7 @@ Kusto language plugin for the Monaco Editor. It provides the following features
 
 ### AMD module system:
 
-Example at ![https://github.com/Azure/monaco-kusto/tree/master/samples/amd]()
+Example at [/samples/amd](https://github.com/Azure/monaco-kusto/tree/master/samples/amd)
 
 1. Run `npm run copyMonacoFilesAMD <path>` or `yarn copyMonacoFilesAMD <path>` where <path> is where you want the monaco and kusto amd modules to be. These files will need to be served as-in.
 2. Using a amd module loader, import `vs/language/kusto/monaco.contribution`
@@ -32,7 +32,7 @@ Example at ![https://github.com/Azure/monaco-kusto/tree/master/samples/amd]()
 
 ### ESM
 
-Parcel example at ![https://github.com/Azure/monaco-kusto/tree/master/samples/parcel]()
+Parcel example at [/samples/parcel](https://github.com/Azure/monaco-kusto/tree/master/samples/parcel)
 
 1. Configure your bundler so `@kusto/monaco-kusto/release/esm/kusto.worker` has it's own entry point
 2. Configure monaco with that entry point and to use `globalAPI` using the `MonacoEnvironment`. This global needs to be set _before_ the monaco editor source is parsed so it will create a global api for this package to use.
@@ -65,6 +65,11 @@ There are 2 APIs to set a Kusto schema:
 
 ## Changelog
 
+### 6.2.0
+
+-   Esm output not longer requires `self.MonacoEnvironment` to be true
+-   `@kusto/monaco-kusto` no exports the same api as `monaco.languages.kusto`
+
 ### 6.0.0
 
 -   Improved quality of AMD build artifacts

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "6.1.1",
+    "version": "6.2.0",
     "description": "CSL, KQL plugin for the Monaco Editor",
     "author": {
         "name": "Microsoft"

package/release/dev/kustoMode.js

@@ -1,11 +1,30 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.1.1(678731e78268dbe877b517e302fa7db86fd96b3c)
+ * monaco-kusto version: 6.2.0(8e26147bc7c3b5a7a3bc6ee55311dfa0b612c10c)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function (exports, main) { 'use strict';
+define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './main-81df16b2'], (function (exports, monaco, main) { 'use strict';
+
+    function _interopNamespaceDefault(e) {
+        var n = Object.create(null);
+        if (e) {
+            Object.keys(e).forEach(function (k) {
+                if (k !== 'default') {
+                    var d = Object.getOwnPropertyDescriptor(e, k);
+                    Object.defineProperty(n, k, d.get ? d : {
+                        enumerable: true,
+                        get: function () { return e[k]; }
+                    });
+                }
+            });
+        }
+        n.default = e;
+        return Object.freeze(n);
+    }
+
+    var monaco__namespace = /*#__PURE__*/_interopNamespaceDefault(monaco);
 
     var _excluded = ["onDidProvideCompletionItems"];
     function _typeof$7(obj) { "@babel/helpers - typeof"; return _typeof$7 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof$7(obj); }
@@ -697,12 +716,9 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
     function _defineProperty$1(obj, key, value) { key = _toPropertyKey$1(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
     function _toPropertyKey$1(arg) { var key = _toPrimitive$1(arg, "string"); return _typeof$1(key) === "symbol" ? key : String(key); }
     function _toPrimitive$1(input, hint) { if (_typeof$1(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof$1(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-    var Uri = monaco.Uri;
-    monaco.Position;
-    var Range = monaco.Range;
-    monaco.Thenable;
-    monaco.CancellationToken;
-    monaco.IDisposable;
+
+    // --- diagnostics ---
+
     var DiagnosticsAdapter = /*#__PURE__*/function () {
       function DiagnosticsAdapter(_monacoInstance, _languageId, _worker, defaults, onSchemaChange) {
         var _this = this;
@@ -787,7 +803,7 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
           }
         };
         if (this.defaults.languageSettings.enableQuickFixes) {
-          this._disposables.push(monaco.languages.registerCodeActionProvider(this._languageId, {
+          this._disposables.push(monaco__namespace.languages.registerCodeActionProvider(this._languageId, {
             provideCodeActions: function () {
               var _provideCodeActions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(model, range, context, _token) {
                 var startOffset, endOffset, showQuickFix, actions;
@@ -1029,16 +1045,16 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
                       overviewRuler: {
                         // The color indication on the right ruler
                         color: 'rgb(255, 18, 18, 0.7)',
-                        position: monaco.editor.OverviewRulerLane.Right
+                        position: monaco__namespace.editor.OverviewRulerLane.Right
                       },
                       minimap: {
                         color: 'rgb(255, 18, 18, 0.7)',
-                        position: monaco.editor.MinimapPosition.Inline
+                        position: monaco__namespace.editor.MinimapPosition.Inline
                       }
                     }
                   };
                 });
-                var oldMarkers = monaco.editor.getModelMarkers({
+                var oldMarkers = monaco__namespace.editor.getModelMarkers({
                   owner: languageId,
                   resource: resource
                 });
@@ -1071,15 +1087,15 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
     function toSeverity(lsSeverity) {
       switch (lsSeverity) {
         case main.DiagnosticSeverity.Error:
-          return monaco.MarkerSeverity.Error;
+          return monaco__namespace.MarkerSeverity.Error;
         case main.DiagnosticSeverity.Warning:
-          return monaco.MarkerSeverity.Warning;
+          return monaco__namespace.MarkerSeverity.Warning;
         case main.DiagnosticSeverity.Information:
-          return monaco.MarkerSeverity.Info;
+          return monaco__namespace.MarkerSeverity.Info;
         case main.DiagnosticSeverity.Hint:
-          return monaco.MarkerSeverity.Hint;
+          return monaco__namespace.MarkerSeverity.Hint;
         default:
-          return monaco.MarkerSeverity.Info;
+          return monaco__namespace.MarkerSeverity.Info;
       }
     }
     function toDiagnostics(resource, diag) {
@@ -1288,7 +1304,7 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
 
         /**
          * Return true if the range doesn't intersect any of the line ranges.
-         * @param range Range
+         * @param range monaco.Range
          * @param impactedLineRanges an array of line ranges
          */
       }, {
@@ -1411,13 +1427,13 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
     function toDecoration(model, classification) {
       var start = model.getPositionAt(classification.start);
       var end = model.getPositionAt(classification.start + classification.length);
-      var range = new Range(start.lineNumber, start.column, end.lineNumber, end.column);
+      var range = new monaco__namespace.Range(start.lineNumber, start.column, end.lineNumber, end.column);
       var inlineClassName = ClassificationKindNames[classification.kind];
       return {
         range: range,
         options: {
           inlineClassName: inlineClassName,
-          stickiness: monaco.editor.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
+          stickiness: monaco__namespace.editor.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
         }
       };
     }
@@ -1445,10 +1461,10 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
       if (!range) {
         return void 0;
       }
-      return new Range(range.start.line + 1, range.start.character + 1, range.end.line + 1, range.end.character + 1);
+      return new monaco__namespace.Range(range.start.line + 1, range.start.character + 1, range.end.line + 1, range.end.character + 1);
     }
     function toCompletionItemKind(kind) {
-      var mItemKind = monaco.languages.CompletionItemKind;
+      var mItemKind = monaco__namespace.languages.CompletionItemKind;
       switch (kind) {
         case main.CompletionItemKind.Text:
           return mItemKind.Text;
@@ -1511,7 +1527,7 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
           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 : "".concat(DOCS_BASE_URL, "/").concat(linkWithoutPostfix);
-          return monaco.Uri.parse(fullURL);
+          return monaco__namespace.Uri.parse(fullURL);
         }
       });
       return {
@@ -1535,7 +1551,7 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
         key: "provideCompletionItems",
         value: function provideCompletionItems(model, position, context, token) {
           var wordInfo = model.getWordUntilPosition(position);
-          var wordRange = new Range(position.lineNumber, wordInfo.startColumn, position.lineNumber, wordInfo.endColumn);
+          var wordRange = new monaco__namespace.Range(position.lineNumber, wordInfo.startColumn, position.lineNumber, wordInfo.endColumn);
           var resource = model.uri;
           var onDidProvideCompletionItems = this.languageSettings.onDidProvideCompletionItems;
           return this._worker(resource).then(function (worker) {
@@ -1563,7 +1579,7 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
                 item.insertText = entry.textEdit.newText;
               }
               if (entry.insertTextFormat === main.InsertTextFormat.Snippet) {
-                item.insertTextRules = monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet;
+                item.insertTextRules = monaco__namespace.languages.CompletionItemInsertTextRule.InsertAsSnippet;
               }
               return item;
             });
@@ -1613,7 +1629,7 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
 
     function toLocation(location) {
       return {
-        uri: Uri.parse(location.uri),
+        uri: monaco__namespace.Uri.parse(location.uri),
         range: toRange(location.range)
       };
     }
@@ -1671,7 +1687,7 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
       }
       var resourceEdits = [];
       for (var _uri2 in edit.changes) {
-        var _uri = Uri.parse(_uri2);
+        var _uri = monaco__namespace.Uri.parse(_uri2);
         var _iterator = _createForOfIteratorHelper(edit.changes[_uri2]),
           _step;
         try {
@@ -1783,7 +1799,7 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
       return {
         start: range.startLine + 1,
         end: range.endLine + 1,
-        kind: monaco.languages.FoldingRangeKind.Region
+        kind: monaco__namespace.languages.FoldingRangeKind.Region
       };
     }
 
@@ -1826,8 +1842,6 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
     function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
     function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
     function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-    monaco.Uri;
-    monaco.IDisposable;
     var kustoWorker;
     var resolveWorker;
     var workerPromise = new Promise(function (resolve, reject) {
@@ -1839,7 +1853,7 @@ define('vs/language/kusto/kustoMode', ['exports', './main-068f3954'], (function
      * @param defaults
      */
     function setupMode(defaults, monacoInstance) {
-      var onSchemaChange = new monaco.Emitter();
+      var onSchemaChange = new monaco__namespace.Emitter();
       // TODO: when should we dispose of these? seems like monaco-css and monaco-typescript don't dispose of these.
       var disposables = [];
       var monarchTokensProvider;

package/release/dev/kustoWorker.js

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.1.1(678731e78268dbe877b517e302fa7db86fd96b3c)
+ * monaco-kusto version: 6.2.0(8e26147bc7c3b5a7a3bc6ee55311dfa0b612c10c)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/kustoWorker', ['exports', './main-068f3954'], (function (exports, main) { 'use strict';
+define('vs/language/kusto/kustoWorker', ['exports', './main-81df16b2'], (function (exports, main) { '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."); }
@@ -3438,14 +3438,12 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-068f3954'], (functio
 
     // an input parameter either be a scalar in which case it has a name, type and cslType, or it can be columnar, in which case
     // it will have a name, and a list of scalar types which are the column types.
-
     /**
      * Schema types:
      * Engine – The main schema type. Contains clusters, databases, tables, table columns and functions.
      * Cluster Manager – Internal only. A schema for clusters that manages other clusters.
      * Data Management – Internal only. A schema for ingestion point operations.
      */
-
     var dotnetTypeToKustoType = {
       'System.SByte': 'bool',
       'System.Byte': 'uint8',
@@ -3838,6 +3836,10 @@ define('vs/language/kusto/kustoWorker', ['exports', './main-068f3954'], (functio
 
             // Adding to columns a prefix to their sortText so they will appear first in the list
             var sortTextPrefix = lsItem.kind === main.CompletionItemKind.Field ? 0 : itemsAsArray.length;
+            var countOfWords = lsItem.label.split('_').length;
+            // We always want results with multiple words to show after shorter options.
+            // For example: to show "count_distinct" after "count"
+            sortTextPrefix = sortTextPrefix * countOfWords;
             var startPosition = document.positionAt(completionItems.EditStart);
             var endPosition = document.positionAt(completionItems.EditStart + completionItems.EditLength);
             lsItem.textEdit = main.TextEdit.replace(main.Range.create(startPosition, endPosition), textToInsert);

package/release/dev/{main-068f3954.js → main-81df16b2.js}

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.1.1(678731e78268dbe877b517e302fa7db86fd96b3c)
+ * monaco-kusto version: 6.2.0(8e26147bc7c3b5a7a3bc6ee55311dfa0b612c10c)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/main-068f3954', ['exports'], (function (exports) { 'use strict';
+define('vs/language/kusto/main-81df16b2', ['exports'], (function (exports) { 'use strict';
 
     /* --------------------------------------------------------------------------------------------
      * Copyright (c) Microsoft Corporation. All rights reserved.