@kusto/monaco-kusto 6.2.0 → 7.0.0

package/README.md

@@ -25,19 +25,25 @@ Kusto language plugin for the Monaco Editor. It provides the following features
 
 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`
-    1. The monaco editors included loader can be made available via a global require `require` by adding the script tag: `<script src="<path>/vs/loader.js"></script>`
-3. You should now be able to create monaco editors with `language: 'kusto'`. The kusto worker can be reached via the monaco global: `monaco.languages.kusto.getKustoWorker()`
+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` 1. The monaco editors included loader can be made available via a global
+   require `require` by adding the script tag: `<script src="<path>/vs/loader.js"></script>`
+3. You should now be able to create monaco editors with `language: 'kusto'`. The
+   kusto worker can be reached via the monaco global:
+   `monaco.languages.kusto.getKustoWorker()`
+4. If using typeScript, add "@kusto/monaco-kusto/globalApi" to compilerOptions.types in tsconfig.json`
 
 ### ESM
 
 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.
-    1. And example of steps 1 & 2 can be seen here: [./samples/parcel/index.html](). This was added to the html file to prevent parcel from including the monaco javascript above it
-3. You should now be able to create monaco editors with `language: 'kusto'`. The kusto worker can be reached via the monaco global: `monaco.languages.kusto.getKustoWorker()`
+2. Configure the global `MonacoEnvironment` with either `getWorkerUrl` or `getWorker`
+3. You should now be able to create monaco editors with `language: 'kusto'`. The
+   kusto worker can be reached via the monaco global:
+   `monaco.languages.kusto.getKustoWorker()`
 
 ### Setting a schema
 
@@ -45,9 +51,10 @@ There are 2 APIs to set a Kusto schema:
 
 1. `setSchema` - the passed schema is of type `ClusterType` (defined in `schema.ts`).
    The database in ROOT.database will be the one in context.
-2. `setSchemaFromShowSchema` - a method to set a schema from the result of the Kusto query `.show schema as json`.
-   The result is a list of databases (see interface `Result` in `schema.ts`), so when this method is used,
-   it also requires a cluster URI and the name of the database in context.
+2. `setSchemaFromShowSchema` - a method to set a schema from the result of the
+   Kusto query `.show schema as json`. The result is a list of databases (see
+   interface `Result` in `schema.ts`), so when this method is used, it also
+   requires a cluster URI and the name of the database in context.
 
 ## Contributing
 
@@ -65,6 +72,20 @@ There are 2 APIs to set a Kusto schema:
 
 ## Changelog
 
+### 7.0.0
+
+-   BREAKING CHANGE: Bumped monaco-editor peer dependency to ~0.37.0
+    -   This version of monaco-editor no longer requires a patch to work with Parcel. Details here: https://github.com/microsoft/monaco-editor/issues/2966
+-   fix: "monaco is not defined" errors when consuming esm files
+-   Moved types from global interface (`monaco.languages.kusto.*`) to esm index
+    file `import { SomeType } from '@kusto/monaco-kusto`. With this, esm
+    consumer no longer need to include
+    `@kusto/monaco-kusto/release/monaco.d.ts`.
+-   ESM output no longer requires `MonacoEnvironment.globalApi` to be `true`
+-   Moved `@kusto/monaco-kusto/release/monaco.d.ts` content to
+    `@kusto/monaco-kusto/globalApi.d.ts`. Original file now references this new
+    one, and will be removed in a future release.
+
 ### 6.2.0
 
 -   Esm output not longer requires `self.MonacoEnvironment` to be true

package/globalApi.d.ts

@@ -0,0 +1,13 @@
+// Augments monaco global types with Kusto api. Should be imported if you're using amd modules, or if you've set `MonacoEnvironment.globalApi` to true.
+
+/// <reference types="monaco-editor/monaco" />
+
+declare namespace monaco.editor {
+    export interface ICodeEditor {
+        getCurrentCommandRange(cursorPosition: monaco.Position): monaco.Range;
+    }
+}
+
+declare namespace monaco.languages {
+    export const kusto: typeof import('@kusto/monaco-kusto');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "6.2.0",
+    "version": "7.0.0",
     "description": "CSL, KQL plugin for the Monaco Editor",
     "author": {
         "name": "Microsoft"
@@ -28,7 +28,8 @@
     "files": [
         "release",
         "README.md",
-        "copyMonacoFilesAMD"
+        "copyMonacoFilesAMD",
+        "globalApi.d.ts"
     ],
     "bin": {
         "copyMonacoFilesAMD": "./copyMonacoFilesAMD.js"
@@ -53,13 +54,13 @@
         "concurrently": "^7.6.0",
         "http-server": "^0.12.3",
         "live-server": "^1.2.1",
-        "monaco-editor": "~0.35.0",
+        "monaco-editor": "~0.37.0",
         "monaco-languages": "2.11.1",
         "rimraf": "^4.1.2",
         "rollup": "^3.17.3",
         "terser": "^5.16.2",
         "ts-node": "^10.9.1",
-        "typescript": "^4.0.0",
+        "typescript": "^5.0.4",
         "vscode-languageserver-textdocument": "1.0.4"
     },
     "dependencies": {
@@ -70,6 +71,6 @@
         "xregexp": "^5.1.1"
     },
     "peerDependencies": {
-        "monaco-editor": "~0.35.0"
+        "monaco-editor": "~0.37.0"
     }
 }

package/release/dev/kustoMode.js

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.2.0(8e26147bc7c3b5a7a3bc6ee55311dfa0b612c10c)
+ * monaco-kusto version: 7.0.0(f23f8fe8dd705f8413d0d094c76eb0af2131aace)
  * 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-81df16b2'], (function (exports, monaco, main) { 'use strict';
+define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './main-5ef10bd7'], (function (exports, monaco, main) { 'use strict';
 
     function _interopNamespaceDefault(e) {
         var n = Object.create(null);
@@ -1569,12 +1569,14 @@ define('vs/language/kusto/kustoMode', ['exports', 'vs/editor/editor.main', './ma
                 insertText: entry.insertText,
                 sortText: entry.sortText,
                 filterText: entry.filterText,
+                // TODO: Is this cast safe?
                 documentation: formatDocLink((_entry$documentation = entry.documentation) === null || _entry$documentation === void 0 ? void 0 : _entry$documentation.value),
                 detail: entry.detail,
                 range: wordRange,
                 kind: toCompletionItemKind(entry.kind)
               };
               if (entry.textEdit) {
+                // TODO: Where is the "range" property coming from?
                 item.range = toRange(entry.textEdit.range);
                 item.insertText = entry.textEdit.newText;
               }

package/release/dev/kustoWorker.js

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.2.0(8e26147bc7c3b5a7a3bc6ee55311dfa0b612c10c)
+ * monaco-kusto version: 7.0.0(f23f8fe8dd705f8413d0d094c76eb0af2131aace)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/kustoWorker', ['exports', './main-81df16b2'], (function (exports, main) { 'use strict';
+define('vs/language/kusto/kustoWorker', ['exports', './main-5ef10bd7'], (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."); }

package/release/dev/{main-81df16b2.js → main-5ef10bd7.js}

@@ -1,11 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.2.0(8e26147bc7c3b5a7a3bc6ee55311dfa0b612c10c)
+ * monaco-kusto version: 7.0.0(f23f8fe8dd705f8413d0d094c76eb0af2131aace)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-define('vs/language/kusto/main-81df16b2', ['exports'], (function (exports) { 'use strict';
+define('vs/language/kusto/main-5ef10bd7', ['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: 6.2.0(8e26147bc7c3b5a7a3bc6ee55311dfa0b612c10c)
+ * monaco-kusto version: 7.0.0(f23f8fe8dd705f8413d0d094c76eb0af2131aace)
  * 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'], (function (require, exports, monaco$1) { 'use strict';
+define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/editor/editor.main'], (function (require, exports, monaco) { 'use strict';
 
     function _interopNamespaceDefault(e) {
         var n = Object.create(null);
@@ -24,7 +24,57 @@ define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/edito
         return Object.freeze(n);
     }
 
-    var monaco__namespace = /*#__PURE__*/_interopNamespaceDefault(monaco$1);
+    var monaco__namespace = /*#__PURE__*/_interopNamespaceDefault(monaco);
+
+    function getCurrentCommandRange(editor, cursorPosition) {
+      var zeroBasedCursorLineNumber = cursorPosition.lineNumber - 1;
+      var lines = editor.getModel().getLinesContent();
+      var commandOrdinal = 0;
+      var linesWithCommandOrdinal = [];
+      for (var lineNumber = 0; lineNumber < lines.length; lineNumber++) {
+        var isEmptyLine = lines[lineNumber].trim() === '';
+        if (isEmptyLine) {
+          // increase commandCounter - we'll be starting a new command.
+          linesWithCommandOrdinal.push({
+            commandOrdinal: commandOrdinal++,
+            lineNumber: lineNumber
+          });
+        } else {
+          linesWithCommandOrdinal.push({
+            commandOrdinal: commandOrdinal,
+            lineNumber: lineNumber
+          });
+        }
+
+        // No need to keep scanning if we're past our line and we've seen an empty line.
+        if (lineNumber > zeroBasedCursorLineNumber && commandOrdinal > linesWithCommandOrdinal[zeroBasedCursorLineNumber].commandOrdinal) {
+          break;
+        }
+      }
+      var currentCommandOrdinal = linesWithCommandOrdinal[zeroBasedCursorLineNumber].commandOrdinal;
+      var currentCommandLines = linesWithCommandOrdinal.filter(function (line) {
+        return line.commandOrdinal === currentCommandOrdinal;
+      });
+      var currentCommandStartLine = currentCommandLines[0].lineNumber + 1;
+      var currentCommandEndLine = currentCommandLines[currentCommandLines.length - 1].lineNumber + 1;
+
+      // End-column of 1 means no characters will be highlighted - since columns are 1-based in monaco apis.
+      // Start-column of 1 and End column of 2 means 1st character is selected.
+      // Thus if a line has n column and we need to provide n+1 so that the entire line will be highlighted.
+      var commandEndColumn = lines[currentCommandEndLine - 1].length + 1;
+      return new monaco__namespace.Range(currentCommandStartLine, 1, currentCommandEndLine, commandEndColumn);
+    }
+
+    /**
+     * Extending ICode editor to contain additional kusto-specific methods.
+     * note that the extend method needs to be called at least once to take affect, otherwise this here code is useless.
+     */
+    function extend(editor) {
+      var proto = Object.getPrototypeOf(editor);
+      proto.getCurrentCommandRange = function (cursorPosition) {
+        getCurrentCommandRange(this, cursorPosition);
+      };
+    }
 
     function _typeof$2(obj) { "@babel/helpers - typeof"; return _typeof$2 = "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$2(obj); }
     function _classCallCheck$2(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -33,6 +83,7 @@ define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/edito
     function _defineProperty$2(obj, key, value) { key = _toPropertyKey$2(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$2(arg) { var key = _toPrimitive$2(arg, "string"); return _typeof$2(key) === "symbol" ? key : String(key); }
     function _toPrimitive$2(input, hint) { if (_typeof$2(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof$2(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+
     /**
      * Highlights the command that surround cursor location
      */
@@ -77,7 +128,7 @@ define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/edito
             this.decorations = this.editor.deltaDecorations(this.decorations, []);
             return;
           }
-          var commandRange = this.editor.getCurrentCommandRange(changeEvent.selection.getStartPosition());
+          var commandRange = getCurrentCommandRange(this.editor, changeEvent.selection.getStartPosition());
           var decorations = [{
             range: commandRange,
             options: KustoCommandHighlighter.CURRENT_COMMAND_HIGHLIGHT
@@ -120,7 +171,7 @@ define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/edito
           editor.addAction({
             id: 'editor.action.kusto.formatCurrentCommand',
             label: 'Format Command Under Cursor',
-            keybindings: [monaco.KeyMod.chord(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyK, monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyF)],
+            keybindings: [monaco__namespace.KeyMod.chord(monaco__namespace.KeyMod.CtrlCmd | monaco__namespace.KeyCode.KeyK, monaco__namespace.KeyMod.CtrlCmd | monaco__namespace.KeyCode.KeyF)],
             run: function run(ed) {
               editor.trigger('KustoCommandFormatter', 'editor.action.formatSelection', null);
             },
@@ -131,52 +182,6 @@ define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/edito
       });
     });
 
-    /**
-     * Extending ICode editor to contain additional kusto-specific methods.
-     * note that the extend method needs to be called at least once to take affect, otherwise this here code is useless.
-     */
-    function extend(editor) {
-      var proto = Object.getPrototypeOf(editor);
-      proto.getCurrentCommandRange = function (cursorPosition) {
-        var zeroBasedCursorLineNumber = cursorPosition.lineNumber - 1;
-        var lines = this.getModel().getLinesContent();
-        var commandOrdinal = 0;
-        var linesWithCommandOrdinal = [];
-        for (var lineNumber = 0; lineNumber < lines.length; lineNumber++) {
-          var isEmptyLine = lines[lineNumber].trim() === '';
-          if (isEmptyLine) {
-            // increase commandCounter - we'll be starting a new command.
-            linesWithCommandOrdinal.push({
-              commandOrdinal: commandOrdinal++,
-              lineNumber: lineNumber
-            });
-          } else {
-            linesWithCommandOrdinal.push({
-              commandOrdinal: commandOrdinal,
-              lineNumber: lineNumber
-            });
-          }
-
-          // No need to keep scanning if we're past our line and we've seen an empty line.
-          if (lineNumber > zeroBasedCursorLineNumber && commandOrdinal > linesWithCommandOrdinal[zeroBasedCursorLineNumber].commandOrdinal) {
-            break;
-          }
-        }
-        var currentCommandOrdinal = linesWithCommandOrdinal[zeroBasedCursorLineNumber].commandOrdinal;
-        var currentCommandLines = linesWithCommandOrdinal.filter(function (line) {
-          return line.commandOrdinal === currentCommandOrdinal;
-        });
-        var currentCommandStartLine = currentCommandLines[0].lineNumber + 1;
-        var currentCommandEndLine = currentCommandLines[currentCommandLines.length - 1].lineNumber + 1;
-
-        // End-column of 1 means no characters will be highlighted - since columns are 1-based in monaco apis.
-        // Start-column of 1 and End column of 2 means 1st character is selected.
-        // Thus if a line has n column and we need to provide n+1 so that the entire line will be highlighted.
-        var commandEndColumn = lines[currentCommandEndLine - 1].length + 1;
-        return new monaco.Range(currentCommandStartLine, 1, currentCommandEndLine, commandEndColumn);
-      };
-    }
-
     function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "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(obj); }
     function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
     function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
@@ -184,8 +189,8 @@ define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/edito
     function _defineProperty(obj, key, value) { key = _toPropertyKey(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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
     function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-    // --- Kusto configuration and defaults ---------
 
+    // --- Kusto configuration and defaults ---------
     var LanguageServiceDefaultsImpl = /*#__PURE__*/function () {
       // in milliseconds. For example - this is 2 minutes 2 * 60 * 1000
 
@@ -492,12 +497,14 @@ define('vs/language/kusto/monaco.contribution', ['require', 'exports', 'vs/edito
     function isStandaloneCodeEditor(editor) {
       return editor.addAction !== undefined;
     }
-    monaco__namespace.languages.kusto = {
+    var globalApi = {
       kustoDefaults: kustoDefaults,
-      getKustoWorker: getKustoWorker
+      getKustoWorker: getKustoWorker,
+      getCurrentCommandRange: getCurrentCommandRange
     };
+    monaco__namespace.languages.kusto = globalApi;
 
-    exports.LanguageServiceDefaultsImpl = LanguageServiceDefaultsImpl;
+    exports.getCurrentCommandRange = getCurrentCommandRange;
     exports.getKustoWorker = getKustoWorker;
     exports.kustoDefaults = kustoDefaults;
 

package/release/esm/commandFormatter.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="monaco-editor/monaco" />
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 export default class KustoCommandFormatter {
     private editor;
     private actionAdded;

package/release/esm/commandHighlighter.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="../monaco" />
-/// <reference types="monaco-editor/monaco" />
+import type * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 /**
  * Highlights the command that surround cursor location
  */

package/release/esm/extendedEditor.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="../monaco" />
-/// <reference types="monaco-editor/monaco" />
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
+export declare function getCurrentCommandRange(editor: monaco.editor.ICodeEditor, cursorPosition: monaco.Position): monaco.Range;
 /**
  * Extending ICode editor to contain additional kusto-specific methods.
  * note that the extend method needs to be called at least once to take affect, otherwise this here code is useless.

package/release/esm/kusto.worker.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.2.0(8e26147bc7c3b5a7a3bc6ee55311dfa0b612c10c)
+ * monaco-kusto version: 7.0.0(f23f8fe8dd705f8413d0d094c76eb0af2131aace)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/

package/release/esm/kustoMode.d.ts

@@ -1,10 +1,8 @@
-/// <reference types="../monaco" />
-/// <reference types="monaco-editor/monaco" />
-import type { LanguageServiceDefaultsImpl } from './monaco.contribution';
+import type { LanguageServiceDefaults } from './monaco.contribution';
 import * as languageFeatures from './languageFeatures';
 /**
  * Called when Kusto language is first needed (a model has the language set)
  * @param defaults
  */
-export declare function setupMode(defaults: LanguageServiceDefaultsImpl, monacoInstance: typeof globalThis.monaco): languageFeatures.WorkerAccessor;
+export declare function setupMode(defaults: LanguageServiceDefaults, monacoInstance: typeof globalThis.monaco): languageFeatures.WorkerAccessor;
 export declare function getKustoWorker(): Promise<languageFeatures.WorkerAccessor>;

package/release/esm/kustoMode.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.2.0(8e26147bc7c3b5a7a3bc6ee55311dfa0b612c10c)
+ * monaco-kusto version: 7.0.0(f23f8fe8dd705f8413d0d094c76eb0af2131aace)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
@@ -862,12 +862,14 @@ class CompletionAdapter {
           insertText: entry.insertText,
           sortText: entry.sortText,
           filterText: entry.filterText,
+          // TODO: Is this cast safe?
           documentation: formatDocLink(entry.documentation?.value),
           detail: entry.detail,
           range: wordRange,
           kind: toCompletionItemKind(entry.kind)
         };
         if (entry.textEdit) {
+          // TODO: Where is the "range" property coming from?
           item.range = toRange(entry.textEdit.range);
           item.insertText = entry.textEdit.newText;
         }

package/release/esm/kustoWorker.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="monaco-editor/monaco" />
 import * as ls from 'vscode-languageserver-types';
+import type * as monaco from 'monaco-editor/esm/vs/editor/editor.worker';
 import * as kustoService from './languageService/kustoLanguageService';
 import type { LanguageSettings } from './languageService/settings';
 import { Schema, showSchema, ScalarParameter, Database, TabularParameter } from './languageService/schema';

package/release/esm/languageFeatures.d.ts

@@ -1,7 +1,5 @@
-/// <reference types="../monaco" />
-/// <reference types="monaco-editor/monaco" />
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
-import type { LanguageServiceDefaultsImpl } from './monaco.contribution';
+import type { LanguageServiceDefaults, LanguageSettings } from './monaco.contribution';
 import type { KustoWorker } from './kustoWorker';
 import type { Schema } from './languageService/schema';
 export interface WorkerAccessor {
@@ -18,7 +16,7 @@ export declare class DiagnosticsAdapter {
     private _schemaListener;
     private _cursorListener;
     private _debouncedValidations;
-    constructor(_monacoInstance: typeof globalThis.monaco, _languageId: string, _worker: WorkerAccessor, defaults: LanguageServiceDefaultsImpl, onSchemaChange: monaco.IEvent<Schema>);
+    constructor(_monacoInstance: typeof globalThis.monaco, _languageId: string, _worker: WorkerAccessor, defaults: LanguageServiceDefaults, onSchemaChange: monaco.IEvent<Schema>);
     private getMonacoCodeActions;
     private getOrCreateDebouncedValidation;
     dispose(): void;
@@ -33,7 +31,7 @@ export declare class ColorizationAdapter {
     private _configurationListener;
     private _schemaListener;
     private decorations;
-    constructor(_monacoInstance: typeof globalThis.monaco, _languageId: string, _worker: WorkerAccessor, defaults: LanguageServiceDefaultsImpl, onSchemaChange: monaco.IEvent<Schema>);
+    constructor(_monacoInstance: typeof globalThis.monaco, _languageId: string, _worker: WorkerAccessor, defaults: LanguageServiceDefaults, onSchemaChange: monaco.IEvent<Schema>);
     dispose(): void;
     /**
      * Return true if the range doesn't intersect any of the line ranges.
@@ -46,7 +44,7 @@ export declare class ColorizationAdapter {
 export declare class CompletionAdapter implements monaco.languages.CompletionItemProvider {
     private _worker;
     private languageSettings;
-    constructor(_worker: WorkerAccessor, languageSettings: globalThis.monaco.languages.kusto.LanguageSettings);
+    constructor(_worker: WorkerAccessor, languageSettings: LanguageSettings);
     get triggerCharacters(): string[];
     provideCompletionItems(model: monaco.editor.IReadOnlyModel, position: monaco.Position, context: monaco.languages.CompletionContext, token: monaco.CancellationToken): monaco.Thenable<monaco.languages.CompletionList>;
 }

package/release/esm/languageService/kustoMonarchLanguageDefinition.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="monaco-editor/monaco" />
+import type * as monaco from 'monaco-editor/esm/vs/editor/editor.worker';
 export declare const KustoLanguageDefinition: monaco.languages.IMonarchLanguage;

package/release/esm/languageService/settings.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="../monaco" />
+import type { OnDidProvideCompletionItems } from '../types';
 export interface LanguageSettings {
     includeControlCommands?: boolean;
     newlineAfterPipe?: boolean;
@@ -7,7 +7,7 @@ export interface LanguageSettings {
     useSemanticColorization?: boolean;
     useTokenColorization?: boolean;
     disabledCompletionItems?: string[];
-    onDidProvideCompletionItems?: monaco.languages.kusto.OnDidProvideCompletionItems;
+    onDidProvideCompletionItems?: OnDidProvideCompletionItems;
     enableHover?: boolean;
     formatter?: FormatterOptions;
     syntaxErrorAsMarkDown?: SyntaxErrorAsMarkDownOptions;

package/release/esm/monaco.contribution.d.ts

@@ -1,14 +1,16 @@
-/// <reference types="../monaco" />
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import type { KustoWorker } from './kustoWorker';
-export declare class LanguageServiceDefaultsImpl implements globalThis.globalThis.monaco.languages.kusto.LanguageServiceDefaults {
+import type { LanguageServiceDefaults, LanguageSettings } from './types';
+export * from './types';
+export { getCurrentCommandRange } from './extendedEditor';
+declare class LanguageServiceDefaultsImpl implements LanguageServiceDefaults {
     private _onDidChange;
     private _languageSettings;
     private _workerMaxIdleTime;
-    constructor(languageSettings: globalThis.monaco.languages.kusto.LanguageSettings);
-    get onDidChange(): monaco.IEvent<globalThis.monaco.languages.kusto.LanguageServiceDefaults>;
-    get languageSettings(): globalThis.monaco.languages.kusto.LanguageSettings;
-    setLanguageSettings(options: globalThis.monaco.languages.kusto.LanguageSettings): void;
+    constructor(languageSettings: LanguageSettings);
+    get onDidChange(): monaco.IEvent<LanguageServiceDefaults>;
+    get languageSettings(): LanguageSettings;
+    setLanguageSettings(options: LanguageSettings): void;
     setMaximumWorkerIdleTime(value: number): void;
     getWorkerMaxIdleTime(): number;
 }