@kusto/monaco-kusto 6.1.0 → 6.1.2

package/release/esm/commandHighlighter.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="../monaco" />
-/// <reference types="monaco-editor-core/monaco" />
+/// <reference types="monaco-editor/monaco" />
 /**
  * Highlights the command that surround cursor location
  */
@@ -10,7 +10,7 @@ export default class KustoCommandHighlighter implements monaco.editor.IEditorCon
     private disposables;
     private decorations;
     /**
-     * Register to cursor movement and seleciton events.
+     * Register to cursor movement and selection events.
      * @param editor monaco editor instance
      */
     constructor(editor: monaco.editor.ICodeEditor);

package/release/esm/extendedEditor.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="../monaco" />
-/// <reference types="monaco-editor-core/monaco" />
+/// <reference types="monaco-editor/monaco" />
 /**
  * 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,26 +1,28 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.1.0(b14a2ec944d355ac340af8280e7c1a4ea98f6c8c)
+ * monaco-kusto version: 6.1.2(4c9ec21ad04b49f9f8e8a8f7fe773fe9a8b47334)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
-import * as worker from 'monaco-editor-core/esm/vs/editor/editor.worker';
+import * as worker from 'monaco-editor/esm/vs/editor/editor.worker';
 import * as ls from 'vscode-languageserver-types';
 import XRegExp from 'xregexp';
+import '@kusto/language-service/bridge.min';
+import '@kusto/language-service/Kusto.JavaScript.Client.min';
+import '@kusto/language-service/newtonsoft.json.min';
+import '@kusto/language-service-next/Kusto.Language.Bridge.min';
 
 // Definition of schema object in the context of language services. This model is exposed to consumers of this library.
 
 // 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.
  */
-
 const dotnetTypeToKustoType = {
   'System.SByte': 'bool',
   'System.Byte': 'uint8',
@@ -76,28 +78,8 @@ const getInputParameterAsCslString = inputParameter => {
   }
 };
 
-// polyfill string endsWith
-if (!String.prototype.endsWith) {
-  String.prototype.endsWith = function (search, this_len) {
-    if (this_len === undefined || this_len > this.length) {
-      this_len = this.length;
-    }
-    return this.substring(this_len - search.length, this_len) === search;
-  };
-}
-
-// If we're running in a web worker - which doesn't share global context with the main thread -
-// we need to manually load dependencies that are not explicit- meaning our non-module dependencies
-// generated by Bridge.Net
-if (typeof document == 'undefined') {
-  // monaco will run the worker from vs/base/worker so the relative path needs to be from there (hence going up 2 dirs)
-  importScripts('../../language/kusto/bridge.min.js');
-  importScripts('../../language/kusto/kusto.javascript.client.min.js');
-  importScripts('../../language/kusto/Kusto.Language.Bridge.min.js');
-}
 var k = Kusto.Data.IntelliSense;
 var parsing = Kusto.Language.Parsing;
-Kusto.Language.Syntax;
 var k2 = Kusto.Language.Editor;
 var sym = Kusto.Language.Symbols;
 var GlobalState = Kusto.Language.GlobalState;
@@ -119,15 +101,7 @@ class ParseProperties {
     return true;
   }
 }
-let TokenKind;
-
-/**
- * A plain old javascript object that is roughly equivalent to the @kusto/language-service-next object, but without
- * all the Bridge.Net properties and methods. this object is being sent from web worker to main thread and turns out
- * that when posting the message we lose all properties (and functions), thus we use a POJO instead.
- * This issue started happening once upgrading to 0.20.0 from 0.15.5.
- */
-(function (TokenKind) {
+let TokenKind = /*#__PURE__*/function (TokenKind) {
   TokenKind[TokenKind["TableToken"] = 2] = "TableToken";
   TokenKind[TokenKind["TableColumnToken"] = 4] = "TableColumnToken";
   TokenKind[TokenKind["OperatorToken"] = 8] = "OperatorToken";
@@ -147,7 +121,16 @@ let TokenKind;
   TokenKind[TokenKind["PluginToken"] = 131072] = "PluginToken";
   TokenKind[TokenKind["BracketRangeToken"] = 262144] = "BracketRangeToken";
   TokenKind[TokenKind["ClientDirectiveToken"] = 524288] = "ClientDirectiveToken";
-})(TokenKind || (TokenKind = {}));
+  return TokenKind;
+}({});
+
+/**
+ * A plain old javascript object that is roughly equivalent to the @kusto/language-service-next object, but without
+ * all the Bridge.Net properties and methods. this object is being sent from web worker to main thread and turns out
+ * that when posting the message we lose all properties (and functions), thus we use a POJO instead.
+ * This issue started happening once upgrading to 0.20.0 from 0.15.5.
+ */
+
 /**
  * convert the bridge.net object to a plain javascript object that only contains data.
  * @param k2Classifications @kusto/language-service-next bridge.net object
@@ -379,7 +362,11 @@ class KustoLanguageService {
       const lsItem = ls.CompletionItem.create(kItem.DisplayText);
 
       // Adding to columns a prefix to their sortText so they will appear first in the list
-      const sortTextPrefix = lsItem.kind === ls.CompletionItemKind.Field ? 0 : itemsAsArray.length;
+      let sortTextPrefix = lsItem.kind === ls.CompletionItemKind.Field ? 0 : itemsAsArray.length;
+      const 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;
       const startPosition = document.positionAt(completionItems.EditStart);
       const endPosition = document.positionAt(completionItems.EditStart + completionItems.EditLength);
       lsItem.textEdit = ls.TextEdit.replace(ls.Range.create(startPosition, endPosition), textToInsert);
@@ -2128,9 +2115,13 @@ class KustoWorker {
           }
         }
       } = result;
-      const range = new monaco.Range(start.line + 1, start.character + 1, end.line + 1, end.character + 1);
       return {
-        range,
+        range: {
+          startLineNumber: start.line + 1,
+          startColumn: start.character + 1,
+          endLineNumber: end.line + 1,
+          endColumn: end.character + 1
+        },
         text
       };
     });

package/release/esm/kustoMode.d.ts

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

package/release/esm/kustoMode.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.1.0(b14a2ec944d355ac340af8280e7c1a4ea98f6c8c)
+ * monaco-kusto version: 6.1.2(4c9ec21ad04b49f9f8e8a8f7fe773fe9a8b47334)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
@@ -98,10 +98,13 @@ const KustoLanguageDefinition = {
   displayName: 'Kusto',
   defaultToken: 'invalid',
   brackets: [['[', ']', 'delimiter.square'], ['(', ')', 'delimiter.parenthesis']],
+  // types are wrong
   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),
+  // Kusto.Data.IntelliSense.CslCommandParser.PromotedOperatorCommandTokens.slice(0),
+  promotedOperatorCommandTokens: ['where', 'count', 'extend', 'join', 'limit', 'order', 'project', 'project-away', 'project-rename', 'project-reorder', 'project-keep', 'render', 'sort', 'summarize', 'distinct', 'take', 'top', 'top-nested', 'top-hitters', 'union', 'mv-expand', 'mv-apply', 'reduce', 'evaluate', 'parse', 'parse-where', 'parse-kv', 'sample', 'sample-distinct', 'make-series', 'getschema', 'serialize', 'invoke', 'as', 'scan'],
+  // Kusto.Data.IntelliSense.CslCommandParser.OperatorCommandTokens.slice(0),
+  operatorCommandTokens: ['filter', 'fork', 'facet', 'range', 'consume', 'find', 'search', 'print', 'partition', 'lookup', 'where', 'count', 'extend', 'join', 'limit', 'order', 'project', 'project-away', 'project-rename', 'project-reorder', 'project-keep', 'render', 'sort', 'summarize', 'distinct', 'take', 'top', 'top-nested', 'top-hitters', 'union', 'mv-expand', 'mv-apply', 'reduce', 'evaluate', 'parse', 'parse-where', 'parse-kv', 'sample', 'sample-distinct', 'make-series', 'getschema', 'serialize', 'invoke', 'as', 'scan'],
   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'],
   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'],
@@ -176,8 +179,7 @@ monaco.Position;
 var Range = monaco.Range;
 monaco.Thenable;
 monaco.CancellationToken;
-monaco.IDisposable;
-var ClassificationKind = Kusto.Language.Editor.ClassificationKind;
+monaco.IDisposable; // --- diagnostics ---
 class DiagnosticsAdapter {
   _disposables = [];
   _contentListener = Object.create(null);
@@ -455,6 +457,41 @@ function toDiagnostics(resource, diag) {
     source: diag.source
   };
 }
+/**
+ * Copy of Kusto.Language.Editor.ClassificationKind we don't have to depend on it in this file
+ */
+const ClassificationKind = {
+  PlainText: 0,
+  Comment: 1,
+  Punctuation: 2,
+  Directive: 3,
+  Literal: 4,
+  StringLiteral: 5,
+  Type: 6,
+  Column: 7,
+  Table: 8,
+  Database: 9,
+  Function: 10,
+  Parameter: 11,
+  Variable: 12,
+  Identifier: 13,
+  ClientParameter: 14,
+  QueryParameter: 15,
+  ScalarOperator: 16,
+  MathOperator: 17,
+  QueryOperator: 18,
+  Command: 19,
+  Keyword: 20,
+  MaterializedView: 21,
+  SchemaMember: 22,
+  SignatureParameter: 23,
+  Option: 24
+};
+const ClassificationKindNames = {};
+for (const [key, value] of Object.entries(ClassificationKind)) {
+  ClassificationKindNames[value] = key;
+}
+
 // commented here is the color definitions are were defined by v1 intellisense terminology:
 // { token: 'comment', foreground: '008000' }, // CommentToken Green
 // { token: 'variable.predefined', foreground: '800080' }, // CalculatedColumnToken Purple
@@ -654,20 +691,11 @@ class ColorizationAdapter {
   }
 }
 
-/**
- * Gets all keys of an enum (the string keys not the numeric values).
- * @param e Enum type
- */
-function getEnumKeys(e) {
-  return Object.keys(e).filter(k => typeof e[k] === 'number');
-}
-
 /**
  * Generates a mapping between ClassificationKind and color.
  */
 function getClassificationColorTriplets() {
-  const keys = getEnumKeys(ClassificationKind);
-  const result = keys.map(key => ({
+  const result = Object.keys(ClassificationKind).map(key => ({
     classification: key,
     colorLight: classificationToColorLight[key],
     colorDark: classificationToColorDark[key]
@@ -704,7 +732,7 @@ 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 inlineClassName = ClassificationKind.$names[classification.kind];
+  const inlineClassName = ClassificationKindNames[classification.kind];
   return {
     range,
     options: {

package/release/esm/kustoWorker.d.ts

@@ -1,18 +1,16 @@
-/// <reference types="monaco-editor-core/monaco" />
-type IWorkerContext = monaco.worker.IWorkerContext;
+/// <reference types="monaco-editor/monaco" />
+import * as ls from 'vscode-languageserver-types';
 import * as kustoService from './languageService/kustoLanguageService';
 import type { LanguageSettings } from './languageService/settings';
 import { Schema, showSchema, ScalarParameter, Database, TabularParameter } from './languageService/schema';
-import * as ls from 'vscode-languageserver-types';
 import type { ColorizationRange } from './languageService/kustoLanguageService';
 import type { RenderInfo } from './languageService/renderInfo';
-import type { FoldingRange } from 'vscode-languageserver-types';
 export declare class KustoWorker {
     private _ctx;
     private _languageService;
     private _languageId;
     private _languageSettings;
-    constructor(ctx: IWorkerContext, createData: ICreateData);
+    constructor(ctx: monaco.worker.IWorkerContext, createData: ICreateData);
     setSchema(schema: Schema): Promise<void>;
     addClusterToSchema(uri: string, clusterName: string, databasesNames: string[]): Promise<void>;
     addDatabaseToSchema(uri: string, clusterName: string, databaseSchema: Database): Promise<void>;
@@ -60,7 +58,7 @@ export declare class KustoWorker {
     }[], includeWarnings?: boolean, includeSuggestions?: boolean): Promise<ls.Diagnostic[]>;
     getResultActions(uri: string, start: number, end: number): Promise<kustoService.ResultAction[]>;
     doRangeFormat(uri: string, range: ls.Range): Promise<ls.TextEdit[]>;
-    doFolding(uri: string): Promise<FoldingRange[]>;
+    doFolding(uri: string): Promise<ls.FoldingRange[]>;
     doDocumentFormat(uri: string): Promise<ls.TextEdit[]>;
     doCurrentCommandFormat(uri: string, caretPosition: ls.Position): Promise<ls.TextEdit[]>;
     doColorization(uri: string, colorizationIntervals: {
@@ -88,5 +86,4 @@ export interface ICreateData {
     languageId: string;
     languageSettings: LanguageSettings;
 }
-export declare function create(ctx: IWorkerContext, createData: ICreateData): KustoWorker;
-export {};
+export declare function create(ctx: monaco.worker.IWorkerContext, createData: ICreateData): KustoWorker;

package/release/esm/languageFeatures.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="monaco-editor-core/monaco" />
+/// <reference types="monaco-editor/monaco" />
 /// <reference types="../monaco" />
 import type { LanguageServiceDefaultsImpl } from './monaco.contribution';
 import type { KustoWorker } from './kustoWorker';

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

@@ -1,10 +1,11 @@
 /// <reference types="@kusto/language-service-next/Kusto.Language.Bridge" />
 /// <reference types="@kusto/language-service/Kusto.JavaScript.Client" />
-import * as s from './schema';
 import * as ls from 'vscode-languageserver-types';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type { FoldingRange } from 'vscode-languageserver-types';
+import * as s from './schema';
 import type { LanguageSettings } from './settings';
+import 'language-service';
 import k = Kusto.Data.IntelliSense;
 import k2 = Kusto.Language.Editor;
 import { Database } from './schema';

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

@@ -1 +1,2 @@
-export declare const KustoLanguageDefinition: any;
+/// <reference types="monaco-editor/monaco" />
+export declare const KustoLanguageDefinition: monaco.languages.IMonarchLanguage;

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

@@ -1,8 +1,8 @@
-export declare type VisualizationType = 'anomalychart' | 'areachart' | 'barchart' | 'columnchart' | 'ladderchart' | 'linechart' | 'piechart' | 'pivotchart' | 'scatterchart' | 'stackedareachart' | 'timechart' | 'table' | 'timeline' | 'timepivot' | 'card';
-export declare type Scale = 'linear' | 'log';
-export declare type LegendVisibility = 'visible' | 'hidden';
-export declare type YSplit = 'none' | 'axes' | 'panels';
-export declare type Kind = 'default' | 'unstacked' | 'stacked' | 'stacked100' | 'map';
+export type VisualizationType = 'anomalychart' | 'areachart' | 'barchart' | 'columnchart' | 'ladderchart' | 'linechart' | 'piechart' | 'pivotchart' | 'scatterchart' | 'stackedareachart' | 'timechart' | 'table' | 'timeline' | 'timepivot' | 'card';
+export type Scale = 'linear' | 'log';
+export type LegendVisibility = 'visible' | 'hidden';
+export type YSplit = 'none' | 'axes' | 'panels';
+export type Kind = 'default' | 'unstacked' | 'stacked' | 'stacked100' | 'map';
 export interface RenderOptions {
     visualization?: null | VisualizationType;
     title?: null | string;

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

@@ -1,12 +1,12 @@
 /// <reference types="../monaco" />
-/// <reference types="monaco-editor-core/monaco" />
-import IEvent = monaco.IEvent;
+/// <reference types="monaco-editor/monaco" />
+import 'monaco-editor';
 export declare class LanguageServiceDefaultsImpl implements monaco.languages.kusto.LanguageServiceDefaults {
     private _onDidChange;
     private _languageSettings;
     private _workerMaxIdleTime;
     constructor(languageSettings: monaco.languages.kusto.LanguageSettings);
-    get onDidChange(): IEvent<monaco.languages.kusto.LanguageServiceDefaults>;
+    get onDidChange(): monaco.IEvent<monaco.languages.kusto.LanguageServiceDefaults>;
     get languageSettings(): monaco.languages.kusto.LanguageSettings;
     setLanguageSettings(options: monaco.languages.kusto.LanguageSettings): void;
     setMaximumWorkerIdleTime(value: number): void;

package/release/esm/monaco.contribution.js

@@ -1,10 +1,12 @@
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * monaco-kusto version: 6.1.0(b14a2ec944d355ac340af8280e7c1a4ea98f6c8c)
+ * monaco-kusto version: 6.1.2(4c9ec21ad04b49f9f8e8a8f7fe773fe9a8b47334)
  * Released under the MIT license
  * https://https://github.com/Azure/monaco-kusto/blob/master/README.md
  *-----------------------------------------------------------------------------*/
 
+import 'monaco-editor';
+
 /**
  * Highlights the command that surround cursor location
  */
@@ -17,12 +19,12 @@ class KustoCommandHighlighter {
   decorations = [];
 
   /**
-   * Register to cursor movement and seleciton events.
+   * Register to cursor movement and selection events.
    * @param editor monaco editor instance
    */
   constructor(editor) {
     this.editor = editor;
-    // Note that selection update is triggered not only for selection changes, but also just when no text selection is occuring and cursor just moves around.
+    // Note that selection update is triggered not only for selection changes, but also just when no text selection is occurring and cursor just moves around.
     // This case is counted as a 0-length selection starting and ending on the cursor position.
     this.editor.onDidChangeCursorSelection(changeEvent => {
       if (this.editor.getModel().getLanguageId() !== 'kusto') {
@@ -129,15 +131,15 @@ function extend(editor) {
   };
 }
 
-var Emitter = monaco.Emitter;
-monaco.IEvent;
-
-// declare var require: <T>(moduleId: [string], callback: (module: T) => void) => void;
+// Import monaco-editor to ensure "monaco" global is available before any other
 
 // --- Kusto configuration and defaults ---------
 
 class LanguageServiceDefaultsImpl {
-  _onDidChange = new Emitter();
+  _onDidChange = new monaco.Emitter();
+
+  // in milliseconds. For example - this is 2 minutes 2 * 60 * 1000
+
   constructor(languageSettings) {
     this.setLanguageSettings(languageSettings);
     // default to never kill worker when idle.

package/release/esm/workerManager.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="../monaco" />
-/// <reference types="monaco-editor-core/monaco" />
+/// <reference types="monaco-editor/monaco" />
 import type { LanguageServiceDefaultsImpl } from './monaco.contribution';
 import type { KustoWorker } from './kustoWorker';
 type Uri = monaco.Uri;