@kusto/monaco-kusto 6.1.2 → 7.0.0

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.1.2(4c9ec21ad04b49f9f8e8a8f7fe773fe9a8b47334)
+ * 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 { WorkerAccessor } from './languageFeatures';
+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 monaco): WorkerAccessor;
-export declare function getKustoWorker(): Promise<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,10 +1,11 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.1.2(4c9ec21ad04b49f9f8e8a8f7fe773fe9a8b47334)
+ * monaco-kusto version: 7.0.0(f23f8fe8dd705f8413d0d094c76eb0af2131aace)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import * as ls from 'vscode-languageserver-types';
 import debounce from 'lodash-es/debounce';
 
@@ -174,12 +175,8 @@ const KustoLanguageDefinition = {
   }
 };
 
-var Uri = monaco.Uri;
-monaco.Position;
-var Range = monaco.Range;
-monaco.Thenable;
-monaco.CancellationToken;
-monaco.IDisposable; // --- diagnostics ---
+// --- diagnostics ---
+
 class DiagnosticsAdapter {
   _disposables = [];
   _contentListener = Object.create(null);
@@ -635,7 +632,7 @@ class ColorizationAdapter {
 
   /**
    * 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
    */
   _rangeDoesNotIntersectAny(range, impactedLineRanges) {
@@ -731,7 +728,7 @@ function injectCss() {
 function toDecoration(model, classification) {
   const start = model.getPositionAt(classification.start);
   const end = model.getPositionAt(classification.start + classification.length);
-  const range = new Range(start.lineNumber, start.column, end.lineNumber, end.column);
+  const range = new monaco.Range(start.lineNumber, start.column, end.lineNumber, end.column);
   const inlineClassName = ClassificationKindNames[classification.kind];
   return {
     range,
@@ -765,7 +762,7 @@ function toRange(range) {
   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.Range(range.start.line + 1, range.start.character + 1, range.end.line + 1, range.end.character + 1);
 }
 function toCompletionItemKind(kind) {
   let mItemKind = monaco.languages.CompletionItemKind;
@@ -850,7 +847,7 @@ class CompletionAdapter {
   }
   provideCompletionItems(model, position, context, token) {
     const wordInfo = model.getWordUntilPosition(position);
-    const wordRange = new Range(position.lineNumber, wordInfo.startColumn, position.lineNumber, wordInfo.endColumn);
+    const wordRange = new monaco.Range(position.lineNumber, wordInfo.startColumn, position.lineNumber, wordInfo.endColumn);
     const resource = model.uri;
     const onDidProvideCompletionItems = this.languageSettings.onDidProvideCompletionItems;
     return this._worker(resource).then(worker => {
@@ -865,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;
         }
@@ -923,7 +922,7 @@ function toMarkedStringArray(contents) {
 
 function toLocation(location) {
   return {
-    uri: Uri.parse(location.uri),
+    uri: monaco.Uri.parse(location.uri),
     range: toRange(location.range)
   };
 }
@@ -971,7 +970,7 @@ function toWorkspaceEdit(edit) {
   }
   let resourceEdits = [];
   for (let uri in edit.changes) {
-    const _uri = Uri.parse(uri);
+    const _uri = monaco.Uri.parse(uri);
     for (let e of edit.changes[uri]) {
       resourceEdits.push({
         resource: _uri,
@@ -1068,8 +1067,6 @@ class HoverAdapter {
   }
 }
 
-monaco.Uri;
-monaco.IDisposable;
 let kustoWorker;
 let resolveWorker;
 let workerPromise = new Promise((resolve, reject) => {

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,15 +1,9 @@
-/// <reference types="monaco-editor/monaco" />
-/// <reference types="../monaco" />
-import type { LanguageServiceDefaultsImpl } from './monaco.contribution';
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
+import type { LanguageServiceDefaults, LanguageSettings } from './monaco.contribution';
 import type { KustoWorker } from './kustoWorker';
-import Uri = monaco.Uri;
-import Position = monaco.Position;
-import Range = monaco.Range;
-import Thenable = monaco.Thenable;
-import CancellationToken = monaco.CancellationToken;
 import type { Schema } from './languageService/schema';
 export interface WorkerAccessor {
-    (first: Uri, ...more: Uri[]): Promise<KustoWorker>;
+    (first: monaco.Uri, ...more: monaco.Uri[]): Promise<KustoWorker>;
 }
 export declare class DiagnosticsAdapter {
     private _monacoInstance;
@@ -22,7 +16,7 @@ export declare class DiagnosticsAdapter {
     private _schemaListener;
     private _cursorListener;
     private _debouncedValidations;
-    constructor(_monacoInstance: typeof 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;
@@ -37,11 +31,11 @@ export declare class ColorizationAdapter {
     private _configurationListener;
     private _schemaListener;
     private decorations;
-    constructor(_monacoInstance: typeof 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.
-     * @param range Range
+     * @param range monaco.Range
      * @param impactedLineRanges an array of line ranges
      */
     private _rangeDoesNotIntersectAny;
@@ -50,42 +44,42 @@ export declare class ColorizationAdapter {
 export declare class CompletionAdapter implements monaco.languages.CompletionItemProvider {
     private _worker;
     private languageSettings;
-    constructor(_worker: WorkerAccessor, languageSettings: monaco.languages.kusto.LanguageSettings);
+    constructor(_worker: WorkerAccessor, languageSettings: LanguageSettings);
     get triggerCharacters(): string[];
-    provideCompletionItems(model: monaco.editor.IReadOnlyModel, position: Position, context: monaco.languages.CompletionContext, token: CancellationToken): Thenable<monaco.languages.CompletionList>;
+    provideCompletionItems(model: monaco.editor.IReadOnlyModel, position: monaco.Position, context: monaco.languages.CompletionContext, token: monaco.CancellationToken): monaco.Thenable<monaco.languages.CompletionList>;
 }
 export declare class DefinitionAdapter {
     private _worker;
     constructor(_worker: WorkerAccessor);
-    provideDefinition(model: monaco.editor.IReadOnlyModel, position: Position, token: CancellationToken): Thenable<monaco.languages.Definition>;
+    provideDefinition(model: monaco.editor.IReadOnlyModel, position: monaco.Position, token: monaco.CancellationToken): monaco.Thenable<monaco.languages.Definition>;
 }
 export declare class ReferenceAdapter implements monaco.languages.ReferenceProvider {
     private _worker;
     constructor(_worker: WorkerAccessor);
-    provideReferences(model: monaco.editor.IReadOnlyModel, position: Position, context: monaco.languages.ReferenceContext, token: CancellationToken): Thenable<monaco.languages.Location[]>;
+    provideReferences(model: monaco.editor.IReadOnlyModel, position: monaco.Position, context: monaco.languages.ReferenceContext, token: monaco.CancellationToken): monaco.Thenable<monaco.languages.Location[]>;
 }
 export declare class RenameAdapter implements monaco.languages.RenameProvider {
     private _worker;
     constructor(_worker: WorkerAccessor);
-    provideRenameEdits(model: monaco.editor.IReadOnlyModel, position: Position, newName: string, token: CancellationToken): Thenable<monaco.languages.WorkspaceEdit>;
+    provideRenameEdits(model: monaco.editor.IReadOnlyModel, position: monaco.Position, newName: string, token: monaco.CancellationToken): monaco.Thenable<monaco.languages.WorkspaceEdit>;
 }
 export declare class DocumentFormatAdapter implements monaco.languages.DocumentFormattingEditProvider {
     private _worker;
     constructor(_worker: WorkerAccessor);
-    provideDocumentFormattingEdits(model: monaco.editor.IReadOnlyModel, options: monaco.languages.FormattingOptions, token: CancellationToken): monaco.languages.TextEdit[] | Thenable<monaco.languages.TextEdit[]>;
+    provideDocumentFormattingEdits(model: monaco.editor.IReadOnlyModel, options: monaco.languages.FormattingOptions, token: monaco.CancellationToken): monaco.languages.TextEdit[] | monaco.Thenable<monaco.languages.TextEdit[]>;
 }
 export declare class FormatAdapter implements monaco.languages.DocumentRangeFormattingEditProvider {
     private _worker;
     constructor(_worker: WorkerAccessor);
-    provideDocumentRangeFormattingEdits(model: monaco.editor.IReadOnlyModel, range: Range, options: monaco.languages.FormattingOptions, token: CancellationToken): monaco.languages.TextEdit[] | Thenable<monaco.languages.TextEdit[]>;
+    provideDocumentRangeFormattingEdits(model: monaco.editor.IReadOnlyModel, range: monaco.Range, options: monaco.languages.FormattingOptions, token: monaco.CancellationToken): monaco.languages.TextEdit[] | monaco.Thenable<monaco.languages.TextEdit[]>;
 }
 export declare class FoldingAdapter implements monaco.languages.FoldingRangeProvider {
     private _worker;
     constructor(_worker: WorkerAccessor);
-    provideFoldingRanges(model: monaco.editor.ITextModel, context: monaco.languages.FoldingContext, token: CancellationToken): monaco.languages.FoldingRange[] | PromiseLike<monaco.languages.FoldingRange[]>;
+    provideFoldingRanges(model: monaco.editor.ITextModel, context: monaco.languages.FoldingContext, token: monaco.CancellationToken): monaco.languages.FoldingRange[] | PromiseLike<monaco.languages.FoldingRange[]>;
 }
 export declare class HoverAdapter implements monaco.languages.HoverProvider {
     private _worker;
     constructor(_worker: WorkerAccessor);
-    provideHover(model: monaco.editor.IReadOnlyModel, position: Position, token: CancellationToken): Thenable<monaco.languages.Hover>;
+    provideHover(model: monaco.editor.IReadOnlyModel, position: monaco.Position, token: monaco.CancellationToken): monaco.Thenable<monaco.languages.Hover>;
 }

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,15 +1,18 @@
-/// <reference types="../monaco" />
-/// <reference types="monaco-editor/monaco" />
-import 'monaco-editor';
-export declare class LanguageServiceDefaultsImpl implements monaco.languages.kusto.LanguageServiceDefaults {
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
+import type { KustoWorker } from './kustoWorker';
+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: monaco.languages.kusto.LanguageSettings);
-    get onDidChange(): monaco.IEvent<monaco.languages.kusto.LanguageServiceDefaults>;
-    get languageSettings(): monaco.languages.kusto.LanguageSettings;
-    setLanguageSettings(options: 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;
 }
-export declare function setupMonacoKusto(monacoInstance: typeof monaco): void;
+export declare function getKustoWorker(): Promise<(first: monaco.Uri, ...more: monaco.Uri[]) => Promise<KustoWorker>>;
+export declare const kustoDefaults: LanguageServiceDefaultsImpl;