@kusto/monaco-kusto 12.0.10 → 12.0.12

package/release/esm/workerManager.js

@@ -1,3 +1,39 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -14,24 +50,33 @@ var WorkerManager = /** @class */ (function () {
         var _this = this;
         this._monacoInstance = _monacoInstance;
         this._defaults = defaults;
-        this._worker = null;
         this._idleCheckInterval = self.setInterval(function () { return _this._checkIfIdle(); }, 30 * 1000);
-        this._lastUsedTime = 0;
         this._configChangeListener = this._defaults.onDidChange(function () { return _this._saveStateAndStopWorker(); });
     }
     WorkerManager.prototype._stopWorker = function () {
-        if (this._worker) {
-            this._worker.dispose();
-            this._worker = null;
-        }
-        this._client = null;
+        var _this = this;
+        var workerToStop = this._workerDetails;
+        this._workerDetailsPromise = null;
+        this._workerDetails = null;
+        // Ensure disposal occurs only after the last request completes.
+        // This is necessary because setting the languageSettings disposes of the worker,
+        // causing the setSchema call to remain unresolved, which prevents the semantic tokens provider from being registered.
+        setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (workerToStop._worker) {
+                    workerToStop._worker.dispose();
+                }
+                return [2 /*return*/];
+            });
+        }); }, 5000);
     };
     WorkerManager.prototype._saveStateAndStopWorker = function () {
         var _this = this;
-        if (!this._worker) {
+        var _a, _b;
+        if (!((_a = this._workerDetails) === null || _a === void 0 ? void 0 : _a._worker)) {
             return;
         }
-        this._worker.getProxy().then(function (proxy) {
+        (_b = this._workerDetails) === null || _b === void 0 ? void 0 : _b._worker.getProxy().then(function (proxy) {
             proxy.getSchema().then(function (schema) {
                 _this._storedState = { schema: schema };
                 _this._stopWorker();
@@ -44,22 +89,22 @@ var WorkerManager = /** @class */ (function () {
         this._stopWorker();
     };
     WorkerManager.prototype._checkIfIdle = function () {
-        if (!this._worker) {
+        var _a, _b;
+        if (!((_a = this._workerDetails) === null || _a === void 0 ? void 0 : _a._worker)) {
             return;
         }
         var maxIdleTime = this._defaults.getWorkerMaxIdleTime();
-        var timePassedSinceLastUsed = Date.now() - this._lastUsedTime;
+        var timePassedSinceLastUsed = Date.now() - ((_b = this._workerDetails) === null || _b === void 0 ? void 0 : _b._lastUsedTime);
         if (maxIdleTime > 0 && timePassedSinceLastUsed > maxIdleTime) {
             this._saveStateAndStopWorker();
         }
     };
     WorkerManager.prototype._getClient = function () {
         var _this = this;
-        this._lastUsedTime = Date.now();
         // Since onDidProvideCompletionItems is not used in web worker, and since functions cannot be trivially serialized (throws exception unable to clone), We remove it here.
         var _a = this._defaults.languageSettings, onDidProvideCompletionItems = _a.onDidProvideCompletionItems, languageSettings = __rest(_a, ["onDidProvideCompletionItems"]);
-        if (!this._client) {
-            this._worker = this._monacoInstance.editor.createWebWorker({
+        if (!this._workerDetailsPromise) {
+            var worker_1 = this._monacoInstance.editor.createWebWorker({
                 // module that exports the create() method and returns a `KustoWorker` instance
                 moduleId: 'vs/language/kusto/kustoWorker',
                 label: 'kusto',
@@ -69,7 +114,7 @@ var WorkerManager = /** @class */ (function () {
                     languageId: 'kusto',
                 },
             });
-            this._client = this._worker.getProxy().then(function (proxy) {
+            var client = worker_1.getProxy().then(function (proxy) {
                 // push state we held onto before killing the client.
                 if (_this._storedState) {
                     return proxy.setSchema(_this._storedState.schema).then(function () { return proxy; });
@@ -78,8 +123,16 @@ var WorkerManager = /** @class */ (function () {
                     return proxy;
                 }
             });
+            this._workerDetailsPromise = client.then(function (client) {
+                _this._workerDetails = {
+                    _worker: worker_1,
+                    _client: client,
+                    _lastUsedTime: Date.now(),
+                };
+                return _this._workerDetails;
+            });
         }
-        return this._client;
+        return this._workerDetailsPromise;
     };
     WorkerManager.prototype.getLanguageServiceWorker = function () {
         var _this = this;
@@ -90,10 +143,11 @@ var WorkerManager = /** @class */ (function () {
         var _client;
         return this._getClient()
             .then(function (client) {
-            _client = client;
+            _client = client._client;
         })
             .then(function (_) {
-            return _this._worker.withSyncedResources(resources);
+            var _a, _b;
+            return (_b = (_a = _this._workerDetails) === null || _a === void 0 ? void 0 : _a._worker) === null || _b === void 0 ? void 0 : _b.withSyncedResources(resources);
         })
             .then(function (_) { return _client; });
     };