@kusto/monaco-kusto 4.0.3 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kusto/monaco-kusto",
-    "version": "4.0.3",
+    "version": "4.1.0",
     "description": "CSL, KQL plugin for the Monaco Editor",
     "author": {
         "name": "Microsoft"
@@ -55,7 +55,7 @@
     },
     "dependencies": {
         "@kusto/language-service": "2.0.0-beta.0",
-        "@kusto/language-service-next": "0.0.49"
+        "@kusto/language-service-next": "0.0.51"
     },
     "peerDependencies": {
         "monaco-editor": "^0.24.0"

package/release/dev/kustoWorker.js

@@ -6358,6 +6358,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             kind: classification.Kind,
         }); });
     }
+    ;
     /**
      * Kusto Language service translates the kusto object model (transpiled from C# by Bridge.Net)
      * to the vscode language server types, which are used by vscode language extensions.
@@ -6511,12 +6512,44 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 _d);
             this._schemaCache = {};
             this._kustoJsSchema = KustoLanguageService.convertToKustoJsSchema(schema);
-            this._kustoJsSchemaV2 = this.convertToKustoJsSchemaV2(schema);
+            this.__kustoJsSchemaV2 = this.convertToKustoJsSchemaV2(schema);
             this._schema = schema;
+            this._clustersSetInGlobalState = new Set();
+            this._nonEmptyDatabaseSetInGlobalState = new Set(); // used to remove clusters that are already in the global state 
             this.configure(languageSettings);
             this._newlineAppendPipePolicy = new Kusto.Data.IntelliSense.ApplyPolicy();
             this._newlineAppendPipePolicy.Text = '\n| ';
         }
+        KustoLanguageService.prototype.createDatabaseUniqueName = function (clusterName, databaseName) {
+            return clusterName + "_" + databaseName;
+        };
+        Object.defineProperty(KustoLanguageService.prototype, "_kustoJsSchemaV2", {
+            /**
+             * A getter for __kustoJsSchemaV2
+             */
+            get: function () {
+                return this.__kustoJsSchemaV2;
+            },
+            /**
+             * A setter for _kustoJsSchemaV2. After a schema (global state) is set, create 2 sets of cluster and database names.
+             */
+            set: function (globalState) {
+                this.__kustoJsSchemaV2 = globalState;
+                // create 2 Sets with cluster names and database names based on the updated Global State. 
+                for (var i = 0; i < globalState.Clusters.Count; i++) {
+                    var clusterSymbol = this._kustoJsSchemaV2.Clusters.getItem(i);
+                    this._clustersSetInGlobalState.add(clusterSymbol.Name);
+                    for (var i2 = 0; i2 < clusterSymbol.Databases.Count; i2++) {
+                        var databaseSymbol = clusterSymbol.Databases.getItem(i2);
+                        if (databaseSymbol.Tables.Count > 0) { // only include database with tables
+                            this._nonEmptyDatabaseSetInGlobalState.add(this.createDatabaseUniqueName(clusterSymbol.Name, databaseSymbol.Name));
+                        }
+                    }
+                }
+            },
+            enumerable: false,
+            configurable: true
+        });
         KustoLanguageService.prototype.configure = function (languageSettings) {
             this._languageSettings = languageSettings;
             // Since we're still reverting to V1 intellisense for control commands, we need to update the rules provider
@@ -6526,15 +6559,43 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
         KustoLanguageService.prototype.doComplete = function (document, position) {
             return this.isIntellisenseV2() ? this.doCompleteV2(document, position) : this.doCompleteV1(document, position);
         };
+        /**
+         * important: Only use during development to test Global State.
+         * Prints clusters, databases and tables that are currently in the GlobalState.
+         */
+        KustoLanguageService.prototype.debugGlobalState = function (globals) {
+            // iterate over clusters
+            console.log("globals.Clusters.Count: " + globals.Clusters.Count);
+            for (var i = 0; i < globals.Clusters.Count; i++) {
+                var cluster = globals.Clusters.getItem(i);
+                console.log("cluster: " + cluster.Name);
+                // iterate over databases
+                console.log("cluster.Databases.Count: " + cluster.Databases.Count);
+                for (var i2 = 0; i2 < cluster.Databases.Count; i2++) {
+                    var database = cluster.Databases.getItem(i2);
+                    console.log("cluster.database: [" + cluster.Name + "].[" + database.Name + "]");
+                    // iterate over tables
+                    console.log("cluster.Databases.Tables.Count: " + database.Tables.Count);
+                    for (var i3 = 0; i3 < database.Tables.Count; i3++) {
+                        var table = database.Tables.getItem(i3);
+                        console.log("cluster.database.table: [" + cluster.Name + "].[" + database.Name + "].[" + table.Name + "]");
+                    }
+                }
+            }
+        };
         KustoLanguageService.prototype.doCompleteV2 = function (document, position) {
             var _this = this;
             if (!document) {
                 return Promise.resolve(ls.CompletionList.create([]));
             }
             var script = this.parseDocumentV2(document);
+            // print cluster/database/tables from CodeScript.Globals
+            // this.debugGlobalState(script.Globals);
+            // get current command
             var cursorOffset = document.offsetAt(position);
-            var currentcommand = this.getCurrentCommandV2(script, cursorOffset);
-            var completionItems = currentcommand.Service.GetCompletionItems(cursorOffset);
+            var currentCommand = script.GetBlockAtPosition(cursorOffset);
+            // get completion items
+            var completionItems = currentCommand.Service.GetCompletionItems(cursorOffset);
             var disabledItems = this.disabledCompletionItemsV2;
             if (this._languageSettings.disabledCompletionItems) {
                 this._languageSettings.disabledCompletionItems.map(function (item) {
@@ -6701,6 +6762,61 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                 });
             });
         };
+        KustoLanguageService.prototype.getClusterReferences = function (document, cursorOffset) {
+            var _a;
+            var script = this.parseDocumentV2(document);
+            var currentBlock = this.getCurrentCommandV2(script, cursorOffset);
+            var clusterReferences = (_a = currentBlock === null || currentBlock === void 0 ? void 0 : currentBlock.Service) === null || _a === void 0 ? void 0 : _a.GetClusterReferences();
+            if (!clusterReferences) {
+                return Promise.resolve([]);
+            }
+            var newClustersReferences = [];
+            var newClustersReferencesSet = new Set(); // used to remove duplicates        
+            // Keep only unique clusters that aren't already exist in the Global State
+            for (var i = 0; i < clusterReferences.Count; i++) {
+                var clusterReference = clusterReferences.getItem(i);
+                var clusterHostName = clusterReference.Cluster;
+                // ignore duplicates
+                if (newClustersReferencesSet.has(clusterHostName)) {
+                    continue;
+                }
+                newClustersReferencesSet.add(clusterHostName);
+                // ignore references that are already in the GlobalState.            
+                if (!this._clustersSetInGlobalState.has(clusterHostName.toLowerCase())) {
+                    newClustersReferences.push({ clusterName: clusterHostName });
+                }
+            }
+            return Promise.resolve(newClustersReferences);
+        };
+        KustoLanguageService.prototype.getDatabaseReferences = function (document, cursorOffset) {
+            var _a;
+            var script = this.parseDocumentV2(document);
+            var currentBlock = this.getCurrentCommandV2(script, cursorOffset);
+            var databasesReferences = (_a = currentBlock === null || currentBlock === void 0 ? void 0 : currentBlock.Service) === null || _a === void 0 ? void 0 : _a.GetDatabaseReferences();
+            if (!databasesReferences) {
+                return Promise.resolve([]);
+            }
+            var newDatabasesReferences = [];
+            var newDatabasesReferencesSet = new Set();
+            for (var i1 = 0; i1 < databasesReferences.Count; i1++) {
+                var databaseReference = databasesReferences.getItem(i1);
+                // ignore duplicates
+                var databaseReferenceUniqueId = this.createDatabaseUniqueName(databaseReference.Cluster, databaseReference.Database);
+                if (newDatabasesReferencesSet.has(databaseReferenceUniqueId)) {
+                    continue;
+                }
+                newDatabasesReferencesSet.add(databaseReferenceUniqueId);
+                // ignore references that are already in the GlobalState.
+                var foundInGlobalState = this._nonEmptyDatabaseSetInGlobalState.has(databaseReferenceUniqueId);
+                if (!foundInGlobalState) {
+                    newDatabasesReferences.push({
+                        databaseName: databaseReference.Database,
+                        clusterName: databaseReference.Cluster
+                    });
+                }
+            }
+            return Promise.resolve(newDatabasesReferences);
+        };
         KustoLanguageService.prototype.doValidation = function (document, changeIntervals) {
             var _this = this;
             // didn't implement validation for v1.
@@ -6841,6 +6957,46 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                     : false;
             });
         };
+        KustoLanguageService.prototype.addClusterToSchema = function (document, clusterName, databaseNames) {
+            var clusterNameOnly = Kusto.Language.KustoFacts.GetHostName(clusterName);
+            var cluster = this._kustoJsSchemaV2.GetCluster$1(clusterNameOnly);
+            if (cluster) {
+                // add databases that are not already in the cluster.
+                databaseNames
+                    .filter(function (databaseName) { return !cluster.GetDatabase(databaseName); })
+                    .map(function (databaseName) {
+                    var symbol = new sym.DatabaseSymbol.$ctor1(databaseName, undefined, false);
+                    cluster = cluster.AddDatabase(symbol);
+                });
+            }
+            if (!cluster) {
+                var databaseSymbols = databaseNames
+                    .map(function (databaseName) {
+                    var symbol = new sym.DatabaseSymbol.$ctor1(databaseName, undefined, false);
+                    return symbol;
+                });
+                var databaseSymbolsList = KustoLanguageService.toBridgeList(databaseSymbols);
+                cluster = new sym.ClusterSymbol.$ctor1(clusterNameOnly, databaseSymbolsList, false);
+            }
+            this._kustoJsSchemaV2 = this._kustoJsSchemaV2.AddOrReplaceCluster(cluster);
+            this._script = k2.CodeScript.From$1(document.getText(), this._kustoJsSchemaV2);
+            return Promise.resolve();
+        };
+        KustoLanguageService.prototype.addDatabaseToSchema = function (document, clusterName, databaseSchema) {
+            var _this = this;
+            return new Promise(function (resolve) {
+                var clusterHostName = Kusto.Language.KustoFacts.GetHostName(clusterName);
+                var cluster = _this._kustoJsSchemaV2.GetCluster$1(clusterHostName);
+                if (!cluster) {
+                    cluster = new sym.ClusterSymbol.$ctor1(clusterHostName, null, false);
+                }
+                var databaseSymbol = KustoLanguageService.convertToDatabaseSymbol(databaseSchema);
+                cluster = cluster.AddOrUpdateDatabase(databaseSymbol);
+                _this._kustoJsSchemaV2 = _this._kustoJsSchemaV2.AddOrReplaceCluster(cluster);
+                _this._script = k2.CodeScript.From$1(document.getText(), _this._kustoJsSchemaV2);
+                resolve();
+            });
+        };
         KustoLanguageService.prototype.setSchema = function (schema) {
             var _this = this;
             this._schema = schema;
@@ -6889,29 +7045,37 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             var databases = Object.keys(schema.Databases)
                 .map(function (key) { return schema.Databases[key]; })
                 .map(function (_a) {
-                var Name = _a.Name, Tables = _a.Tables, Functions = _a.Functions, MinorVersion = _a.MinorVersion, MajorVersion = _a.MajorVersion;
+                var Name = _a.Name, Tables = _a.Tables, ExternalTables = _a.ExternalTables, MaterializedViews = _a.MaterializedViews, Functions = _a.Functions, MinorVersion = _a.MinorVersion, MajorVersion = _a.MajorVersion;
                 return ({
                     name: Name,
                     minorVersion: MinorVersion,
                     majorVersion: MajorVersion,
-                    tables: Object.keys(Tables)
-                        .map(function (key) { return Tables[key]; })
+                    tables: [].concat.apply([], [[Tables, 'Table'], [MaterializedViews, 'MaterializedView'], [ExternalTables, 'ExternalTable']]
+                        .filter(function (_a) {
+                        var tableContainer = _a[0];
+                        return tableContainer;
+                    })
                         .map(function (_a) {
-                        var Name = _a.Name, OrderedColumns = _a.OrderedColumns, DocString = _a.DocString, EntityType = _a.EntityType;
-                        return ({
-                            name: Name,
-                            docstring: DocString,
-                            entityType: EntityType,
-                            columns: OrderedColumns.map(function (_a) {
-                                var Name = _a.Name, Type = _a.Type, DocString = _a.DocString, CslType = _a.CslType;
-                                return ({
-                                    name: Name,
-                                    type: CslType,
-                                    docstring: DocString,
-                                });
-                            }),
+                        var tableContainer = _a[0], tableEntity = _a[1];
+                        return Object
+                            .values(tableContainer)
+                            .map(function (_a) {
+                            var Name = _a.Name, OrderedColumns = _a.OrderedColumns, DocString = _a.DocString;
+                            return ({
+                                name: Name,
+                                docstring: DocString,
+                                entityType: tableEntity,
+                                columns: OrderedColumns.map(function (_a) {
+                                    var Name = _a.Name, Type = _a.Type, DocString = _a.DocString, CslType = _a.CslType;
+                                    return ({
+                                        name: Name,
+                                        type: CslType,
+                                        docstring: DocString,
+                                    });
+                                }),
+                            });
                         });
-                    }),
+                    })),
                     functions: Object.keys(Functions)
                         .map(function (key) { return Functions[key]; })
                         .map(function (_a) {
@@ -7547,7 +7711,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
             var argumentType = new sym.TableSymbol.ctor(param.columns.map(function (col) { return KustoLanguageService.createColumnSymbol(col); }));
             return new sym.Parameter.$ctor2(param.name, argumentType);
         };
-        KustoLanguageService.convertToDatabaseSymbol = function (db, globalState, addFunctions) {
+        KustoLanguageService.convertToDatabaseSymbol = function (db) {
             var createFunctionSymbol = function (fn) {
                 var parameters = fn.inputParameters.map(function (param) {
                     return KustoLanguageService.createParameter(param);
@@ -7604,7 +7768,7 @@ define('vs/language/kusto/languageService/kustoLanguageService',["require", "exp
                     cachedDb.database.majorVersion < db.majorVersion ||
                     (shouldIncludeFunctions && !cachedDb.includesFunctions)) {
                     // only add functions for the database in context (it's very time consuming)
-                    var databaseSymbol_1 = KustoLanguageService.convertToDatabaseSymbol(db, globalState, shouldIncludeFunctions);
+                    var databaseSymbol_1 = KustoLanguageService.convertToDatabaseSymbol(db);
                     cached[db.name] = { database: db, symbol: databaseSymbol_1, includesFunctions: shouldIncludeFunctions };
                 }
                 var databaseSymbol = cached[db.name].symbol;
@@ -7866,6 +8030,22 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.setSchema = function (schema) {
             return this._languageService.setSchema(schema);
         };
+        KustoWorker.prototype.addClusterToSchema = function (uri, clusterName, databasesNames) {
+            var document = this._getTextDocument(uri);
+            if (!document) {
+                console.error("addClusterToSchema: document is " + document + ". uri is " + uri);
+                return null;
+            }
+            return this._languageService.addClusterToSchema(document, clusterName, databasesNames);
+        };
+        KustoWorker.prototype.addDatabaseToSchema = function (uri, clusterName, databaseSchema) {
+            var document = this._getTextDocument(uri);
+            if (!document) {
+                console.error("addDatabaseToSchema: document is " + document + ". uri is " + uri);
+                return null;
+            }
+            return this._languageService.addDatabaseToSchema(document, clusterName, databaseSchema);
+        };
         KustoWorker.prototype.setSchemaFromShowSchema = function (schema, clusterConnectionString, databaseInContextName) {
             return this._languageService.setSchemaFromShowSchema(schema, clusterConnectionString, databaseInContextName);
         };
@@ -8036,6 +8216,14 @@ define('vs/language/kusto/kustoWorker',["require", "exports", "./languageService
         KustoWorker.prototype.setParameters = function (parameters) {
             return this._languageService.setParameters(parameters);
         };
+        KustoWorker.prototype.getClusterReferences = function (uri, cursorOffset) {
+            var document = this._getTextDocument(uri);
+            return this._languageService.getClusterReferences(document, cursorOffset);
+        };
+        KustoWorker.prototype.getDatabaseReferences = function (uri, cursorOffset) {
+            var document = this._getTextDocument(uri);
+            return this._languageService.getDatabaseReferences(document, cursorOffset);
+        };
         KustoWorker.prototype._getTextDocument = function (uri) {
             var models = this._ctx.getMirrorModels();
             for (var _i = 0, models_1 = models; _i < models_1.length; _i++) {

package/release/esm/kustoWorker.js

@@ -11,6 +11,22 @@ var KustoWorker = /** @class */ (function () {
     KustoWorker.prototype.setSchema = function (schema) {
         return this._languageService.setSchema(schema);
     };
+    KustoWorker.prototype.addClusterToSchema = function (uri, clusterName, databasesNames) {
+        var document = this._getTextDocument(uri);
+        if (!document) {
+            console.error("addClusterToSchema: document is " + document + ". uri is " + uri);
+            return null;
+        }
+        return this._languageService.addClusterToSchema(document, clusterName, databasesNames);
+    };
+    KustoWorker.prototype.addDatabaseToSchema = function (uri, clusterName, databaseSchema) {
+        var document = this._getTextDocument(uri);
+        if (!document) {
+            console.error("addDatabaseToSchema: document is " + document + ". uri is " + uri);
+            return null;
+        }
+        return this._languageService.addDatabaseToSchema(document, clusterName, databaseSchema);
+    };
     KustoWorker.prototype.setSchemaFromShowSchema = function (schema, clusterConnectionString, databaseInContextName) {
         return this._languageService.setSchemaFromShowSchema(schema, clusterConnectionString, databaseInContextName);
     };
@@ -181,6 +197,14 @@ var KustoWorker = /** @class */ (function () {
     KustoWorker.prototype.setParameters = function (parameters) {
         return this._languageService.setParameters(parameters);
     };
+    KustoWorker.prototype.getClusterReferences = function (uri, cursorOffset) {
+        var document = this._getTextDocument(uri);
+        return this._languageService.getClusterReferences(document, cursorOffset);
+    };
+    KustoWorker.prototype.getDatabaseReferences = function (uri, cursorOffset) {
+        var document = this._getTextDocument(uri);
+        return this._languageService.getDatabaseReferences(document, cursorOffset);
+    };
     KustoWorker.prototype._getTextDocument = function (uri) {
         var models = this._ctx.getMirrorModels();
         for (var _i = 0, models_1 = models; _i < models_1.length; _i++) {

package/release/esm/languageService/kustoLanguageService.js

@@ -96,6 +96,7 @@ function toClassifiedRange(k2Classifications) {
         kind: classification.Kind,
     }); });
 }
+;
 /**
  * Kusto Language service translates the kusto object model (transpiled from C# by Bridge.Net)
  * to the vscode language server types, which are used by vscode language extensions.
@@ -249,12 +250,44 @@ var KustoLanguageService = /** @class */ (function () {
             _d);
         this._schemaCache = {};
         this._kustoJsSchema = KustoLanguageService.convertToKustoJsSchema(schema);
-        this._kustoJsSchemaV2 = this.convertToKustoJsSchemaV2(schema);
+        this.__kustoJsSchemaV2 = this.convertToKustoJsSchemaV2(schema);
         this._schema = schema;
+        this._clustersSetInGlobalState = new Set();
+        this._nonEmptyDatabaseSetInGlobalState = new Set(); // used to remove clusters that are already in the global state 
         this.configure(languageSettings);
         this._newlineAppendPipePolicy = new Kusto.Data.IntelliSense.ApplyPolicy();
         this._newlineAppendPipePolicy.Text = '\n| ';
     }
+    KustoLanguageService.prototype.createDatabaseUniqueName = function (clusterName, databaseName) {
+        return clusterName + "_" + databaseName;
+    };
+    Object.defineProperty(KustoLanguageService.prototype, "_kustoJsSchemaV2", {
+        /**
+         * A getter for __kustoJsSchemaV2
+         */
+        get: function () {
+            return this.__kustoJsSchemaV2;
+        },
+        /**
+         * A setter for _kustoJsSchemaV2. After a schema (global state) is set, create 2 sets of cluster and database names.
+         */
+        set: function (globalState) {
+            this.__kustoJsSchemaV2 = globalState;
+            // create 2 Sets with cluster names and database names based on the updated Global State. 
+            for (var i = 0; i < globalState.Clusters.Count; i++) {
+                var clusterSymbol = this._kustoJsSchemaV2.Clusters.getItem(i);
+                this._clustersSetInGlobalState.add(clusterSymbol.Name);
+                for (var i2 = 0; i2 < clusterSymbol.Databases.Count; i2++) {
+                    var databaseSymbol = clusterSymbol.Databases.getItem(i2);
+                    if (databaseSymbol.Tables.Count > 0) { // only include database with tables
+                        this._nonEmptyDatabaseSetInGlobalState.add(this.createDatabaseUniqueName(clusterSymbol.Name, databaseSymbol.Name));
+                    }
+                }
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
     KustoLanguageService.prototype.configure = function (languageSettings) {
         this._languageSettings = languageSettings;
         // Since we're still reverting to V1 intellisense for control commands, we need to update the rules provider
@@ -264,15 +297,43 @@ var KustoLanguageService = /** @class */ (function () {
     KustoLanguageService.prototype.doComplete = function (document, position) {
         return this.isIntellisenseV2() ? this.doCompleteV2(document, position) : this.doCompleteV1(document, position);
     };
+    /**
+     * important: Only use during development to test Global State.
+     * Prints clusters, databases and tables that are currently in the GlobalState.
+     */
+    KustoLanguageService.prototype.debugGlobalState = function (globals) {
+        // iterate over clusters
+        console.log("globals.Clusters.Count: " + globals.Clusters.Count);
+        for (var i = 0; i < globals.Clusters.Count; i++) {
+            var cluster = globals.Clusters.getItem(i);
+            console.log("cluster: " + cluster.Name);
+            // iterate over databases
+            console.log("cluster.Databases.Count: " + cluster.Databases.Count);
+            for (var i2 = 0; i2 < cluster.Databases.Count; i2++) {
+                var database = cluster.Databases.getItem(i2);
+                console.log("cluster.database: [" + cluster.Name + "].[" + database.Name + "]");
+                // iterate over tables
+                console.log("cluster.Databases.Tables.Count: " + database.Tables.Count);
+                for (var i3 = 0; i3 < database.Tables.Count; i3++) {
+                    var table = database.Tables.getItem(i3);
+                    console.log("cluster.database.table: [" + cluster.Name + "].[" + database.Name + "].[" + table.Name + "]");
+                }
+            }
+        }
+    };
     KustoLanguageService.prototype.doCompleteV2 = function (document, position) {
         var _this = this;
         if (!document) {
             return Promise.resolve(ls.CompletionList.create([]));
         }
         var script = this.parseDocumentV2(document);
+        // print cluster/database/tables from CodeScript.Globals
+        // this.debugGlobalState(script.Globals);
+        // get current command
         var cursorOffset = document.offsetAt(position);
-        var currentcommand = this.getCurrentCommandV2(script, cursorOffset);
-        var completionItems = currentcommand.Service.GetCompletionItems(cursorOffset);
+        var currentCommand = script.GetBlockAtPosition(cursorOffset);
+        // get completion items
+        var completionItems = currentCommand.Service.GetCompletionItems(cursorOffset);
         var disabledItems = this.disabledCompletionItemsV2;
         if (this._languageSettings.disabledCompletionItems) {
             this._languageSettings.disabledCompletionItems.map(function (item) {
@@ -439,6 +500,61 @@ var KustoLanguageService = /** @class */ (function () {
             });
         });
     };
+    KustoLanguageService.prototype.getClusterReferences = function (document, cursorOffset) {
+        var _a;
+        var script = this.parseDocumentV2(document);
+        var currentBlock = this.getCurrentCommandV2(script, cursorOffset);
+        var clusterReferences = (_a = currentBlock === null || currentBlock === void 0 ? void 0 : currentBlock.Service) === null || _a === void 0 ? void 0 : _a.GetClusterReferences();
+        if (!clusterReferences) {
+            return Promise.resolve([]);
+        }
+        var newClustersReferences = [];
+        var newClustersReferencesSet = new Set(); // used to remove duplicates        
+        // Keep only unique clusters that aren't already exist in the Global State
+        for (var i = 0; i < clusterReferences.Count; i++) {
+            var clusterReference = clusterReferences.getItem(i);
+            var clusterHostName = clusterReference.Cluster;
+            // ignore duplicates
+            if (newClustersReferencesSet.has(clusterHostName)) {
+                continue;
+            }
+            newClustersReferencesSet.add(clusterHostName);
+            // ignore references that are already in the GlobalState.            
+            if (!this._clustersSetInGlobalState.has(clusterHostName.toLowerCase())) {
+                newClustersReferences.push({ clusterName: clusterHostName });
+            }
+        }
+        return Promise.resolve(newClustersReferences);
+    };
+    KustoLanguageService.prototype.getDatabaseReferences = function (document, cursorOffset) {
+        var _a;
+        var script = this.parseDocumentV2(document);
+        var currentBlock = this.getCurrentCommandV2(script, cursorOffset);
+        var databasesReferences = (_a = currentBlock === null || currentBlock === void 0 ? void 0 : currentBlock.Service) === null || _a === void 0 ? void 0 : _a.GetDatabaseReferences();
+        if (!databasesReferences) {
+            return Promise.resolve([]);
+        }
+        var newDatabasesReferences = [];
+        var newDatabasesReferencesSet = new Set();
+        for (var i1 = 0; i1 < databasesReferences.Count; i1++) {
+            var databaseReference = databasesReferences.getItem(i1);
+            // ignore duplicates
+            var databaseReferenceUniqueId = this.createDatabaseUniqueName(databaseReference.Cluster, databaseReference.Database);
+            if (newDatabasesReferencesSet.has(databaseReferenceUniqueId)) {
+                continue;
+            }
+            newDatabasesReferencesSet.add(databaseReferenceUniqueId);
+            // ignore references that are already in the GlobalState.
+            var foundInGlobalState = this._nonEmptyDatabaseSetInGlobalState.has(databaseReferenceUniqueId);
+            if (!foundInGlobalState) {
+                newDatabasesReferences.push({
+                    databaseName: databaseReference.Database,
+                    clusterName: databaseReference.Cluster
+                });
+            }
+        }
+        return Promise.resolve(newDatabasesReferences);
+    };
     KustoLanguageService.prototype.doValidation = function (document, changeIntervals) {
         var _this = this;
         // didn't implement validation for v1.
@@ -579,6 +695,46 @@ var KustoLanguageService = /** @class */ (function () {
                 : false;
         });
     };
+    KustoLanguageService.prototype.addClusterToSchema = function (document, clusterName, databaseNames) {
+        var clusterNameOnly = Kusto.Language.KustoFacts.GetHostName(clusterName);
+        var cluster = this._kustoJsSchemaV2.GetCluster$1(clusterNameOnly);
+        if (cluster) {
+            // add databases that are not already in the cluster.
+            databaseNames
+                .filter(function (databaseName) { return !cluster.GetDatabase(databaseName); })
+                .map(function (databaseName) {
+                var symbol = new sym.DatabaseSymbol.$ctor1(databaseName, undefined, false);
+                cluster = cluster.AddDatabase(symbol);
+            });
+        }
+        if (!cluster) {
+            var databaseSymbols = databaseNames
+                .map(function (databaseName) {
+                var symbol = new sym.DatabaseSymbol.$ctor1(databaseName, undefined, false);
+                return symbol;
+            });
+            var databaseSymbolsList = KustoLanguageService.toBridgeList(databaseSymbols);
+            cluster = new sym.ClusterSymbol.$ctor1(clusterNameOnly, databaseSymbolsList, false);
+        }
+        this._kustoJsSchemaV2 = this._kustoJsSchemaV2.AddOrReplaceCluster(cluster);
+        this._script = k2.CodeScript.From$1(document.getText(), this._kustoJsSchemaV2);
+        return Promise.resolve();
+    };
+    KustoLanguageService.prototype.addDatabaseToSchema = function (document, clusterName, databaseSchema) {
+        var _this = this;
+        return new Promise(function (resolve) {
+            var clusterHostName = Kusto.Language.KustoFacts.GetHostName(clusterName);
+            var cluster = _this._kustoJsSchemaV2.GetCluster$1(clusterHostName);
+            if (!cluster) {
+                cluster = new sym.ClusterSymbol.$ctor1(clusterHostName, null, false);
+            }
+            var databaseSymbol = KustoLanguageService.convertToDatabaseSymbol(databaseSchema);
+            cluster = cluster.AddOrUpdateDatabase(databaseSymbol);
+            _this._kustoJsSchemaV2 = _this._kustoJsSchemaV2.AddOrReplaceCluster(cluster);
+            _this._script = k2.CodeScript.From$1(document.getText(), _this._kustoJsSchemaV2);
+            resolve();
+        });
+    };
     KustoLanguageService.prototype.setSchema = function (schema) {
         var _this = this;
         this._schema = schema;
@@ -627,29 +783,37 @@ var KustoLanguageService = /** @class */ (function () {
         var databases = Object.keys(schema.Databases)
             .map(function (key) { return schema.Databases[key]; })
             .map(function (_a) {
-            var Name = _a.Name, Tables = _a.Tables, Functions = _a.Functions, MinorVersion = _a.MinorVersion, MajorVersion = _a.MajorVersion;
+            var Name = _a.Name, Tables = _a.Tables, ExternalTables = _a.ExternalTables, MaterializedViews = _a.MaterializedViews, Functions = _a.Functions, MinorVersion = _a.MinorVersion, MajorVersion = _a.MajorVersion;
             return ({
                 name: Name,
                 minorVersion: MinorVersion,
                 majorVersion: MajorVersion,
-                tables: Object.keys(Tables)
-                    .map(function (key) { return Tables[key]; })
+                tables: [].concat.apply([], [[Tables, 'Table'], [MaterializedViews, 'MaterializedView'], [ExternalTables, 'ExternalTable']]
+                    .filter(function (_a) {
+                    var tableContainer = _a[0];
+                    return tableContainer;
+                })
                     .map(function (_a) {
-                    var Name = _a.Name, OrderedColumns = _a.OrderedColumns, DocString = _a.DocString, EntityType = _a.EntityType;
-                    return ({
-                        name: Name,
-                        docstring: DocString,
-                        entityType: EntityType,
-                        columns: OrderedColumns.map(function (_a) {
-                            var Name = _a.Name, Type = _a.Type, DocString = _a.DocString, CslType = _a.CslType;
-                            return ({
-                                name: Name,
-                                type: CslType,
-                                docstring: DocString,
-                            });
-                        }),
+                    var tableContainer = _a[0], tableEntity = _a[1];
+                    return Object
+                        .values(tableContainer)
+                        .map(function (_a) {
+                        var Name = _a.Name, OrderedColumns = _a.OrderedColumns, DocString = _a.DocString;
+                        return ({
+                            name: Name,
+                            docstring: DocString,
+                            entityType: tableEntity,
+                            columns: OrderedColumns.map(function (_a) {
+                                var Name = _a.Name, Type = _a.Type, DocString = _a.DocString, CslType = _a.CslType;
+                                return ({
+                                    name: Name,
+                                    type: CslType,
+                                    docstring: DocString,
+                                });
+                            }),
+                        });
                     });
-                }),
+                })),
                 functions: Object.keys(Functions)
                     .map(function (key) { return Functions[key]; })
                     .map(function (_a) {
@@ -1285,7 +1449,7 @@ var KustoLanguageService = /** @class */ (function () {
         var argumentType = new sym.TableSymbol.ctor(param.columns.map(function (col) { return KustoLanguageService.createColumnSymbol(col); }));
         return new sym.Parameter.$ctor2(param.name, argumentType);
     };
-    KustoLanguageService.convertToDatabaseSymbol = function (db, globalState, addFunctions) {
+    KustoLanguageService.convertToDatabaseSymbol = function (db) {
         var createFunctionSymbol = function (fn) {
             var parameters = fn.inputParameters.map(function (param) {
                 return KustoLanguageService.createParameter(param);
@@ -1342,7 +1506,7 @@ var KustoLanguageService = /** @class */ (function () {
                 cachedDb.database.majorVersion < db.majorVersion ||
                 (shouldIncludeFunctions && !cachedDb.includesFunctions)) {
                 // only add functions for the database in context (it's very time consuming)
-                var databaseSymbol_1 = KustoLanguageService.convertToDatabaseSymbol(db, globalState, shouldIncludeFunctions);
+                var databaseSymbol_1 = KustoLanguageService.convertToDatabaseSymbol(db);
                 cached[db.name] = { database: db, symbol: databaseSymbol_1, includesFunctions: shouldIncludeFunctions };
             }
             var databaseSymbol = cached[db.name].symbol;