@kusto/monaco-kusto 5.3.8 → 5.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "5.3.8",
+    "version": "5.3.10",
     "description": "CSL, KQL plugin for the Monaco Editor",
     "author": {
         "name": "Microsoft"
@@ -55,7 +55,7 @@
     },
     "dependencies": {
         "@kusto/language-service": "0.0.39",
-        "@kusto/language-service-next": "0.0.61"
+        "@kusto/language-service-next": "0.0.62"
     },
     "peerDependencies": {
         "monaco-editor": "0.34.1"

package/release/dev/kustoMode.js

@@ -3194,7 +3194,7 @@ define('vs/language/kusto/kustoMode',["require", "exports", "./workerManager", "
             for (var _i = 1; _i < arguments.length; _i++) {
                 more[_i - 1] = arguments[_i];
             }
-            var augmentedSetSchema = function (schema, worker, globalParameters) {
+            var augmentedSetSchema = function (schema, worker, globalScalarParameters, globalTabularParameters) {
                 var workerPromise = worker.setSchema(schema);
                 workerPromise.then(function () {
                     onSchemaChange.fire(schema);
@@ -3202,10 +3202,10 @@ define('vs/language/kusto/kustoMode',["require", "exports", "./workerManager", "
             };
             var worker = client.getLanguageServiceWorker.apply(client, [first].concat(more));
             return worker.then(function (worker) {
-                return (__assign(__assign({}, worker), { setSchema: function (schema) { return augmentedSetSchema(schema, worker); }, setSchemaFromShowSchema: function (schema, connection, database, globalParameters) {
+                return (__assign(__assign({}, worker), { setSchema: function (schema) { return augmentedSetSchema(schema, worker); }, setSchemaFromShowSchema: function (schema, connection, database, globalScalarParameters, globalTabularParameters) {
                         worker
                             .normalizeSchema(schema, connection, database)
-                            .then(function (schema) { return (globalParameters ? __assign(__assign({}, schema), { globalParameters: globalParameters }) : schema); })
+                            .then(function (schema) { return (globalScalarParameters ? __assign(__assign({}, schema), { globalScalarParameters: globalScalarParameters, globalTabularParameters: globalTabularParameters }) : schema); })
                             .then(function (normalized) { return augmentedSetSchema(normalized, worker); });
                     } }));
             });

package/release/dev/kustoWorker.js

@@ -6656,6 +6656,13 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 define('vs/language/kusto/languageService/kustoLanguageService',["require", "exports", "./schema", "vscode-languageserver-types", "xregexp", "./schema"], function (require, exports, s, ls, XRegExp, schema_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -7437,13 +7444,15 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 resolve(undefined);
             });
         };
-        KustoLanguageService.prototype.setParameters = function (parameters) {
+        KustoLanguageService.prototype.setParameters = function (scalarParameters, tabularParameters) {
             if (!this._languageSettings.useIntellisenseV2 || this._schema.clusterType !== 'Engine') {
                 throw new Error('setParameters requires intellisense V2 and Engine cluster');
             }
-            this._schema.globalParameters = parameters;
-            var symbols = parameters.map(function (param) { return KustoLanguageService.createParameterSymbol(param); });
-            this._kustoJsSchemaV2 = this._kustoJsSchemaV2.WithParameters(KustoLanguageService.toBridgeList(symbols));
+            this._schema.globalScalarParameters = scalarParameters;
+            this._schema.globalTabularParameters = tabularParameters;
+            var scalarSymbols = scalarParameters.map(function (param) { return KustoLanguageService.createParameterSymbol(param); });
+            var tabularSymbols = tabularParameters.map(function (param) { return KustoLanguageService.createTabularParameterSymbol(param); });
+            this._kustoJsSchemaV2 = this._kustoJsSchemaV2.WithParameters(KustoLanguageService.toBridgeList(__spreadArrays(scalarSymbols, tabularSymbols)));
             return Promise.resolve(undefined);
         };
         /**
@@ -7452,10 +7461,10 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
          * @param clusterConnectionString cluster connection string
          * @param databaseInContextName name of database in context
          */
-        KustoLanguageService.prototype.setSchemaFromShowSchema = function (schema, clusterConnectionString, databaseInContextName, globalParameters) {
+        KustoLanguageService.prototype.setSchemaFromShowSchema = function (schema, clusterConnectionString, databaseInContextName, globalScalarParameters, globalTabularParameters) {
             var _this = this;
             return this.normalizeSchema(schema, clusterConnectionString, databaseInContextName).then(function (normalized) {
-                return _this.setSchema(__assign(__assign({}, normalized), { globalParameters: globalParameters }));
+                return _this.setSchema(__assign(__assign({}, normalized), { globalScalarParameters: globalScalarParameters, globalTabularParameters: globalTabularParameters }));
             });
         };
         /**
@@ -7491,11 +7500,12 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                                 docstring: DocString,
                                 entityType: tableEntity,
                                 columns: OrderedColumns.map(function (_a) {
-                                    var Name = _a.Name, Type = _a.Type, DocString = _a.DocString, CslType = _a.CslType;
+                                    var Name = _a.Name, Type = _a.Type, DocString = _a.DocString, CslType = _a.CslType, Examples = _a.Examples;
                                     return ({
                                         name: Name,
                                         type: CslType,
                                         docstring: DocString,
+                                        examples: Examples,
                                     });
                                 }),
                             });
@@ -8120,12 +8130,17 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             return "let " + fn.name + " = " + signature + " " + fn.body;
         };
         KustoLanguageService.createColumnSymbol = function (col) {
-            return new sym.ColumnSymbol(col.name, sym.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(col.type)), col.docstring, null);
+            return new sym.ColumnSymbol(col.name, sym.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(col.type)), col.docstring, null, null, col.examples ? KustoLanguageService.toBridgeList(col.examples) : null);
         };
         KustoLanguageService.createParameterSymbol = function (param) {
             var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(param.type));
             return new sym.ParameterSymbol(param.name, paramSymbol, null);
         };
+        KustoLanguageService.createTabularParameterSymbol = function (param) {
+            var columnSymbols = param.columns.map(function (col) { return KustoLanguageService.createColumnSymbol(col); });
+            var para = new Kusto.Language.Symbols.TableSymbol.$ctor4(param.name, columnSymbols);
+            return new sym.ParameterSymbol(param.name, para, param.docstring);
+        };
         KustoLanguageService.createParameter = function (param) {
             if (!param.columns) {
                 var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol(schema_1.getCslTypeNameFromClrType(param.type));
@@ -8146,7 +8161,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                     return KustoLanguageService.createParameter(param);
                 });
                 // TODO: handle outputColumns (right now it doesn't seem to be implemented for any function).
-                return new sym.FunctionSymbol.$ctor16(fn.name, fn.body, KustoLanguageService.toBridgeList(parameters), fn.docstring);
+                return new sym.FunctionSymbol.$ctor14(fn.name, fn.body, KustoLanguageService.toBridgeList(parameters), fn.docstring);
             };
             var createTableSymbol = function (tbl) {
                 var _a;
@@ -8175,6 +8190,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             return databaseSymbol;
         };
         KustoLanguageService.prototype.convertToKustoJsSchemaV2 = function (schema) {
+            var _a, _b;
             var cached = this._schemaCache[schema.cluster.connectionString];
             // create a cache entry for the cluster if non yet exists.
             if (!cached) {
@@ -8218,12 +8234,12 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             if (databaseInContext) {
                 globalState = globalState.WithDatabase(databaseInContext);
             }
-            // Inject global parameters to global scope.
-            if (schema.globalParameters) {
-                var parameters = schema.globalParameters.map(function (param) {
-                    return KustoLanguageService.createParameterSymbol(param);
-                });
-                globalState = globalState.WithParameters(KustoLanguageService.toBridgeList(parameters));
+            // Inject global scalar parameters to global scope.
+            var scalarParameters = ((_a = schema.globalScalarParameters) !== null && _a !== void 0 ? _a : []).map(function (param) { return KustoLanguageService.createParameterSymbol(param); });
+            // Inject global tabular parameters to global scope.
+            var tabularParameters = ((_b = schema.globalTabularParameters) !== null && _b !== void 0 ? _b : []).map(function (param) { return KustoLanguageService.createTabularParameterSymbol(param); });
+            if (tabularParameters.length || scalarParameters.length) {
+                globalState = globalState.WithParameters(KustoLanguageService.toBridgeList(__spreadArrays(scalarParameters, tabularParameters)));
             }
             return globalState;
         };
@@ -8645,8 +8661,8 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
             var hover = this._languageService.doHover(document, position);
             return hover;
         };
-        KustoWorker.prototype.setParameters = function (parameters) {
-            return this._languageService.setParameters(parameters);
+        KustoWorker.prototype.setParameters = function (scalarParameters, tabularParameters) {
+            return this._languageService.setParameters(scalarParameters, tabularParameters);
         };
         KustoWorker.prototype.getClusterReferences = function (uri, cursorOffset) {
             var document = this._getTextDocument(uri);

package/release/esm/kustoMode.js

@@ -35,7 +35,7 @@ export function setupMode(defaults, monacoInstance) {
         for (var _i = 1; _i < arguments.length; _i++) {
             more[_i - 1] = arguments[_i];
         }
-        var augmentedSetSchema = function (schema, worker, globalParameters) {
+        var augmentedSetSchema = function (schema, worker, globalScalarParameters, globalTabularParameters) {
             var workerPromise = worker.setSchema(schema);
             workerPromise.then(function () {
                 onSchemaChange.fire(schema);
@@ -43,10 +43,10 @@ export function setupMode(defaults, monacoInstance) {
         };
         var worker = client.getLanguageServiceWorker.apply(client, [first].concat(more));
         return worker.then(function (worker) {
-            return (__assign(__assign({}, worker), { setSchema: function (schema) { return augmentedSetSchema(schema, worker); }, setSchemaFromShowSchema: function (schema, connection, database, globalParameters) {
+            return (__assign(__assign({}, worker), { setSchema: function (schema) { return augmentedSetSchema(schema, worker); }, setSchemaFromShowSchema: function (schema, connection, database, globalScalarParameters, globalTabularParameters) {
                     worker
                         .normalizeSchema(schema, connection, database)
-                        .then(function (schema) { return (globalParameters ? __assign(__assign({}, schema), { globalParameters: globalParameters }) : schema); })
+                        .then(function (schema) { return (globalScalarParameters ? __assign(__assign({}, schema), { globalScalarParameters: globalScalarParameters, globalTabularParameters: globalTabularParameters }) : schema); })
                         .then(function (normalized) { return augmentedSetSchema(normalized, worker); });
                 } }));
         });

package/release/esm/kustoWorker.js

@@ -194,8 +194,8 @@ var KustoWorker = /** @class */ (function () {
         var hover = this._languageService.doHover(document, position);
         return hover;
     };
-    KustoWorker.prototype.setParameters = function (parameters) {
-        return this._languageService.setParameters(parameters);
+    KustoWorker.prototype.setParameters = function (scalarParameters, tabularParameters) {
+        return this._languageService.setParameters(scalarParameters, tabularParameters);
     };
     KustoWorker.prototype.getClusterReferences = function (uri, cursorOffset) {
         var document = this._getTextDocument(uri);

package/release/esm/languageService/kustoLanguageService.js

@@ -9,6 +9,13 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 /// <reference path="../../node_modules/@kusto/language-service/Kusto.JavaScript.Client.d.ts" />
 /// <reference path="../../node_modules/@kusto/language-service-next/Kusto.Language.Bridge.d.ts" />
 /// <reference path="../typings/refs.d.ts" />
@@ -793,13 +800,15 @@ var KustoLanguageService = /** @class */ (function () {
             resolve(undefined);
         });
     };
-    KustoLanguageService.prototype.setParameters = function (parameters) {
+    KustoLanguageService.prototype.setParameters = function (scalarParameters, tabularParameters) {
         if (!this._languageSettings.useIntellisenseV2 || this._schema.clusterType !== 'Engine') {
             throw new Error('setParameters requires intellisense V2 and Engine cluster');
         }
-        this._schema.globalParameters = parameters;
-        var symbols = parameters.map(function (param) { return KustoLanguageService.createParameterSymbol(param); });
-        this._kustoJsSchemaV2 = this._kustoJsSchemaV2.WithParameters(KustoLanguageService.toBridgeList(symbols));
+        this._schema.globalScalarParameters = scalarParameters;
+        this._schema.globalTabularParameters = tabularParameters;
+        var scalarSymbols = scalarParameters.map(function (param) { return KustoLanguageService.createParameterSymbol(param); });
+        var tabularSymbols = tabularParameters.map(function (param) { return KustoLanguageService.createTabularParameterSymbol(param); });
+        this._kustoJsSchemaV2 = this._kustoJsSchemaV2.WithParameters(KustoLanguageService.toBridgeList(__spreadArrays(scalarSymbols, tabularSymbols)));
         return Promise.resolve(undefined);
     };
     /**
@@ -808,10 +817,10 @@ var KustoLanguageService = /** @class */ (function () {
      * @param clusterConnectionString cluster connection string
      * @param databaseInContextName name of database in context
      */
-    KustoLanguageService.prototype.setSchemaFromShowSchema = function (schema, clusterConnectionString, databaseInContextName, globalParameters) {
+    KustoLanguageService.prototype.setSchemaFromShowSchema = function (schema, clusterConnectionString, databaseInContextName, globalScalarParameters, globalTabularParameters) {
         var _this = this;
         return this.normalizeSchema(schema, clusterConnectionString, databaseInContextName).then(function (normalized) {
-            return _this.setSchema(__assign(__assign({}, normalized), { globalParameters: globalParameters }));
+            return _this.setSchema(__assign(__assign({}, normalized), { globalScalarParameters: globalScalarParameters, globalTabularParameters: globalTabularParameters }));
         });
     };
     /**
@@ -847,11 +856,12 @@ var KustoLanguageService = /** @class */ (function () {
                             docstring: DocString,
                             entityType: tableEntity,
                             columns: OrderedColumns.map(function (_a) {
-                                var Name = _a.Name, Type = _a.Type, DocString = _a.DocString, CslType = _a.CslType;
+                                var Name = _a.Name, Type = _a.Type, DocString = _a.DocString, CslType = _a.CslType, Examples = _a.Examples;
                                 return ({
                                     name: Name,
                                     type: CslType,
                                     docstring: DocString,
+                                    examples: Examples,
                                 });
                             }),
                         });
@@ -1476,12 +1486,17 @@ var KustoLanguageService = /** @class */ (function () {
         return "let " + fn.name + " = " + signature + " " + fn.body;
     };
     KustoLanguageService.createColumnSymbol = function (col) {
-        return new sym.ColumnSymbol(col.name, sym.ScalarTypes.GetSymbol(getCslTypeNameFromClrType(col.type)), col.docstring, null);
+        return new sym.ColumnSymbol(col.name, sym.ScalarTypes.GetSymbol(getCslTypeNameFromClrType(col.type)), col.docstring, null, null, col.examples ? KustoLanguageService.toBridgeList(col.examples) : null);
     };
     KustoLanguageService.createParameterSymbol = function (param) {
         var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol(getCslTypeNameFromClrType(param.type));
         return new sym.ParameterSymbol(param.name, paramSymbol, null);
     };
+    KustoLanguageService.createTabularParameterSymbol = function (param) {
+        var columnSymbols = param.columns.map(function (col) { return KustoLanguageService.createColumnSymbol(col); });
+        var para = new Kusto.Language.Symbols.TableSymbol.$ctor4(param.name, columnSymbols);
+        return new sym.ParameterSymbol(param.name, para, param.docstring);
+    };
     KustoLanguageService.createParameter = function (param) {
         if (!param.columns) {
             var paramSymbol = Kusto.Language.Symbols.ScalarTypes.GetSymbol(getCslTypeNameFromClrType(param.type));
@@ -1502,7 +1517,7 @@ var KustoLanguageService = /** @class */ (function () {
                 return KustoLanguageService.createParameter(param);
             });
             // TODO: handle outputColumns (right now it doesn't seem to be implemented for any function).
-            return new sym.FunctionSymbol.$ctor16(fn.name, fn.body, KustoLanguageService.toBridgeList(parameters), fn.docstring);
+            return new sym.FunctionSymbol.$ctor14(fn.name, fn.body, KustoLanguageService.toBridgeList(parameters), fn.docstring);
         };
         var createTableSymbol = function (tbl) {
             var _a;
@@ -1531,6 +1546,7 @@ var KustoLanguageService = /** @class */ (function () {
         return databaseSymbol;
     };
     KustoLanguageService.prototype.convertToKustoJsSchemaV2 = function (schema) {
+        var _a, _b;
         var cached = this._schemaCache[schema.cluster.connectionString];
         // create a cache entry for the cluster if non yet exists.
         if (!cached) {
@@ -1574,12 +1590,12 @@ var KustoLanguageService = /** @class */ (function () {
         if (databaseInContext) {
             globalState = globalState.WithDatabase(databaseInContext);
         }
-        // Inject global parameters to global scope.
-        if (schema.globalParameters) {
-            var parameters = schema.globalParameters.map(function (param) {
-                return KustoLanguageService.createParameterSymbol(param);
-            });
-            globalState = globalState.WithParameters(KustoLanguageService.toBridgeList(parameters));
+        // Inject global scalar parameters to global scope.
+        var scalarParameters = ((_a = schema.globalScalarParameters) !== null && _a !== void 0 ? _a : []).map(function (param) { return KustoLanguageService.createParameterSymbol(param); });
+        // Inject global tabular parameters to global scope.
+        var tabularParameters = ((_b = schema.globalTabularParameters) !== null && _b !== void 0 ? _b : []).map(function (param) { return KustoLanguageService.createTabularParameterSymbol(param); });
+        if (tabularParameters.length || scalarParameters.length) {
+            globalState = globalState.WithParameters(KustoLanguageService.toBridgeList(__spreadArrays(scalarParameters, tabularParameters)));
         }
         return globalState;
     };

package/release/esm/monaco.d.ts

@@ -73,7 +73,8 @@ declare module monaco.languages.kusto {
             schema: any,
             clusterConnectionString: string,
             databaseInContextName: string,
-            globalParameters: ScalarParameter[]
+            globalScalarParameters: ScalarParameter[],
+            globalTabularParameters: TabularParameter[]
         ): Promise<void>;
         normalizeSchema(
             schema: any,
@@ -121,7 +122,7 @@ declare module monaco.languages.kusto {
         doRangeFormat(uri: string, range: ls.Range): Promise<ls.TextEdit[]>;
         doCurrentCommandFormat(uri: string, caretPosition: ls.Position): Promise<ls.TextEdit[]>;
         doValidation(uri: string, intervals: { start: number; end: number }[], includeWarnings?: boolean, includeSuggestions?: boolean): Promise<ls.Diagnostic[]>;
-        setParameters(parameters: ScalarParameter[]): void;
+        setParameters(scalarParameters: ScalarParameter[], tabularParameters: TabularParameter): void;
         /**
          * Get all the database references from the current command. 
          * If database's schema is already cached in previous calls to setSchema or addDatabaseToSchema it will not be returned.
@@ -193,6 +194,10 @@ declare module monaco.languages.kusto {
         cslDefaultValue?: string;
     }
 
+    export interface TabularParameter extends ScalarParameter {
+        columns: Column[]
+    }
+
     // 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.
     export type InputParameter = ScalarParameter & { columns?: ScalarParameter[] };