typescript-language-server 1.1.0 → 1.2.0

package/lib/tsp-client.js

@@ -1,177 +1,224 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 /*
  * Copyright (C) 2017, 2018 TypeFox and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
-import * as fs from 'node:fs';
-import * as cp from 'node:child_process';
-import * as readline from 'node:readline';
-import * as decoder from 'node:string_decoder';
-import { temporaryFile } from 'tempy';
 import { PrefixingLogger } from './logger.js';
-import { Deferred } from './utils.js';
+import API from './utils/api.js';
+import { ServerResponse } from './tsServer/requests.js';
+import { TypeScriptServerError } from './tsServer/serverError.js';
+import { TypeScriptServerSpawner } from './tsServer/spawner.js';
+class ServerInitializingIndicator {
+    constructor(lspClient) {
+        this.lspClient = lspClient;
+    }
+    reset() {
+        if (this._loadingProjectName) {
+            this._loadingProjectName = undefined;
+            if (this._progressReporter) {
+                this._progressReporter.done();
+                this._progressReporter = undefined;
+            }
+        }
+    }
+    async startedLoadingProject(projectName) {
+        // TS projects are loaded sequentially. Cancel existing task because it should always be resolved before
+        // the incoming project loading task is.
+        this.reset();
+        this._loadingProjectName = projectName;
+        this._progressReporter = await this.lspClient.createProgressReporter();
+        this._progressReporter.begin('Initializing JS/TS language features…');
+    }
+    finishedLoadingProject(projectName) {
+        if (this._loadingProjectName === projectName) {
+            this._loadingProjectName = undefined;
+            if (this._progressReporter) {
+                this._progressReporter.done();
+                this._progressReporter = undefined;
+            }
+        }
+    }
+}
 export class TspClient {
     constructor(options) {
         this.options = options;
-        this.tsserverProc = null;
-        this.readlineInterface = null;
-        this.seq = 0;
-        this.deferreds = {};
-        this.apiVersion = options.apiVersion;
+        this.primaryTsServer = null;
+        this.apiVersion = options.typescriptVersion.version || API.defaultVersion;
         this.logger = new PrefixingLogger(options.logger, '[tsclient]');
         this.tsserverLogger = new PrefixingLogger(options.logger, '[tsserver]');
+        this.loadingIndicator = new ServerInitializingIndicator(options.lspClient);
     }
     start() {
-        if (this.readlineInterface) {
-            return false;
-        }
-        const { tsserverPath, logFile, logVerbosity, disableAutomaticTypingAcquisition, maxTsServerMemory, npmLocation, locale, globalPlugins, pluginProbeLocations, } = this.options;
-        const args = [];
-        if (logFile) {
-            args.push('--logFile', logFile);
-        }
-        if (logVerbosity) {
-            args.push('--logVerbosity', logVerbosity);
-        }
-        if (globalPlugins && globalPlugins.length) {
-            args.push('--globalPlugins', globalPlugins.join(','));
-        }
-        if (pluginProbeLocations && pluginProbeLocations.length) {
-            args.push('--pluginProbeLocations', pluginProbeLocations.join(','));
-        }
-        if (disableAutomaticTypingAcquisition) {
-            args.push('--disableAutomaticTypingAcquisition');
-        }
-        if (npmLocation) {
-            this.logger.info(`using npm from ${npmLocation}`);
-            args.push('--npmLocation', npmLocation);
-        }
-        if (locale) {
-            args.push('--locale', locale);
-        }
-        this.cancellationPipeName = temporaryFile({ name: 'tscancellation' });
-        args.push('--cancellationPipeName', `${this.cancellationPipeName}*`);
-        this.logger.log(`Starting tsserver : '${tsserverPath} ${args.join(' ')}'`);
-        const options = {
-            silent: true,
-            execArgv: [
-                ...maxTsServerMemory ? [`--max-old-space-size=${maxTsServerMemory}`] : [],
-            ],
-        };
-        this.tsserverProc = cp.fork(tsserverPath, args, options);
-        this.tsserverProc.on('exit', (exitCode, signal) => {
+        const tsServerSpawner = new TypeScriptServerSpawner(this.apiVersion, this.logger);
+        const tsServer = tsServerSpawner.spawn(this.options.typescriptVersion, this.options);
+        tsServer.onExit((data) => {
             this.shutdown();
+            this.tsserverLogger.error(`Exited. Code: ${data.code}. Signal: ${data.signal}`);
             if (this.options.onExit) {
-                this.options.onExit(exitCode, signal);
+                this.options.onExit(data.code, data.signal);
             }
         });
-        const { stdout, stdin, stderr } = this.tsserverProc;
-        if (!stdout || !stdin || !stderr) {
-            this.logger.error(`Failed initializing input/output of tsserver (stdin: ${!!stdin}, stdout: ${!!stdout}, stderr: ${!!stderr})`);
-            return false;
-        }
-        this.readlineInterface = readline.createInterface(stdout, stdin, undefined);
-        this.readlineInterface.on('line', line => this.processMessage(line));
-        const dec = new decoder.StringDecoder('utf-8');
-        stderr.addListener('data', data => {
-            const stringMsg = typeof data === 'string' ? data : dec.write(data);
-            this.tsserverLogger.error(stringMsg);
+        tsServer.onError((err) => {
+            if (err) {
+                this.tsserverLogger.error('Exited with error. Error message is: {0}', err.message || err.name);
+            }
+            this.serviceExited();
         });
+        tsServer.onEvent(event => this.dispatchEvent(event));
+        this.primaryTsServer = tsServer;
         return true;
     }
+    serviceExited() {
+        this.primaryTsServer = null;
+        this.loadingIndicator.reset();
+    }
+    // private static isLoggingEnabled(configuration: TspClientOptions) {
+    //     return configuration.tsServerLogLevel !== TsServerLogLevel.Off;
+    // }
+    dispatchEvent(event) {
+        switch (event.event) {
+            case "syntaxDiag" /* EventTypes.SyntaxDiag */:
+            case "semanticDiag" /* EventTypes.SementicDiag */:
+            case "suggestionDiag" /* EventTypes.SuggestionDiag */: {
+                // This event also roughly signals that projects have been loaded successfully (since the TS server is synchronous)
+                this.loadingIndicator.reset();
+                this.options.onEvent?.(event);
+                break;
+            }
+            // case EventTypes.ConfigFileDiag:
+            //     this._onConfigDiagnosticsReceived.fire(event as tsp.ConfigFileDiagnosticEvent);
+            //     break;
+            // case EventTypes.projectLanguageServiceState: {
+            //     const body = (event as tsp.ProjectLanguageServiceStateEvent).body!;
+            //     if (this.serverState.type === ServerState.Type.Running) {
+            //         this.serverState.updateLanguageServiceEnabled(body.languageServiceEnabled);
+            //     }
+            //     this._onProjectLanguageServiceStateChanged.fire(body);
+            //     break;
+            // }
+            // case EventTypes.projectsUpdatedInBackground: {
+            //     this.loadingIndicator.reset();
+            //     const body = (event as tsp.ProjectsUpdatedInBackgroundEvent).body;
+            //     const resources = body.openFiles.map(file => this.toResource(file));
+            //     this.bufferSyncSupport.getErr(resources);
+            //     break;
+            // }
+            // case EventTypes.beginInstallTypes:
+            //     this._onDidBeginInstallTypings.fire((event as tsp.BeginInstallTypesEvent).body);
+            //     break;
+            // case EventTypes.endInstallTypes:
+            //     this._onDidEndInstallTypings.fire((event as tsp.EndInstallTypesEvent).body);
+            //     break;
+            // case EventTypes.typesInstallerInitializationFailed:
+            //     this._onTypesInstallerInitializationFailed.fire((event as tsp.TypesInstallerInitializationFailedEvent).body);
+            //     break;
+            case "projectLoadingStart" /* EventTypes.ProjectLoadingStart */:
+                this.loadingIndicator.startedLoadingProject(event.body.projectName);
+                break;
+            case "projectLoadingFinish" /* EventTypes.ProjectLoadingFinish */:
+                this.loadingIndicator.finishedLoadingProject(event.body.projectName);
+                break;
+        }
+    }
     shutdown() {
-        this.readlineInterface?.close();
-        if (this.tsserverProc) {
-            this.tsserverProc.stdin?.destroy();
-            this.tsserverProc.kill('SIGTERM');
+        if (this.loadingIndicator) {
+            this.loadingIndicator.reset();
+        }
+        if (this.primaryTsServer) {
+            this.primaryTsServer.kill();
         }
     }
     notify(command, args) {
-        this.sendMessage(command, true, args);
-    }
-    request(command, args, token) {
-        this.sendMessage(command, false, args);
-        const seq = this.seq;
-        const deferred = new Deferred();
-        this.deferreds[seq] = deferred;
-        const request = deferred.promise;
-        if (token) {
-            const onCancelled = token.onCancellationRequested(() => {
-                onCancelled.dispose();
-                if (this.cancellationPipeName) {
-                    const requestCancellationPipeName = `${this.cancellationPipeName}${seq}`;
-                    fs.writeFile(requestCancellationPipeName, '', err => {
-                        if (!err) {
-                            request.then(() => fs.unlink(requestCancellationPipeName, () => { }));
-                        }
-                    });
-                }
+        this.executeWithoutWaitingForResponse(command, args);
+    }
+    requestGeterr(args, token) {
+        return this.executeAsync("geterr" /* CommandTypes.Geterr */, args, token);
+    }
+    request(command, args, token, config) {
+        return this.execute(command, args, token, config);
+    }
+    // Low-level API.
+    execute(command, args, token, config) {
+        let executions;
+        // if (config?.cancelOnResourceChange) {
+        //     if (this.primaryTsServer) {
+        //         const source = new CancellationTokenSource();
+        //         token.onCancellationRequested(() => source.cancel());
+        //         const inFlight: ToCancelOnResourceChanged = {
+        //             resource: config.cancelOnResourceChange,
+        //             cancel: () => source.cancel(),
+        //         };
+        //         runningServerState.toCancelOnResourceChange.add(inFlight);
+        //         executions = this.executeImpl(command, args, {
+        //             isAsync: false,
+        //             token: source.token,
+        //             expectsResult: true,
+        //             ...config,
+        //         });
+        //         executions[0]!.finally(() => {
+        //             runningServerState.toCancelOnResourceChange.delete(inFlight);
+        //             source.dispose();
+        //         });
+        //     }
+        // }
+        if (!executions) {
+            executions = this.executeImpl(command, args, {
+                isAsync: false,
+                token,
+                expectsResult: true,
+                ...config,
             });
         }
-        return request;
-    }
-    sendMessage(command, notification, args) {
-        this.seq = this.seq + 1;
-        const request = {
-            command,
-            seq: this.seq,
-            type: 'request',
-        };
-        if (args) {
-            request.arguments = args;
-        }
-        const serializedRequest = JSON.stringify(request) + '\n';
-        if (this.tsserverProc) {
-            this.tsserverProc.stdin.write(serializedRequest);
-            this.logger.log(notification ? 'notify' : 'request', request);
+        if (config?.nonRecoverable) {
+            executions[0].catch(err => this.fatalError(command, err));
         }
-        else {
-            this.logger.error(`Message "${command}" couldn't be sent. Tsserver process not started.`);
+        if (command === "updateOpen" /* CommandTypes.UpdateOpen */) {
+            // If update open has completed, consider that the project has loaded
+            Promise.all(executions).then(() => {
+                this.loadingIndicator.reset();
+            });
         }
+        return executions[0];
     }
-    processMessage(untrimmedMessageString) {
-        const messageString = untrimmedMessageString.trim();
-        if (!messageString || messageString.startsWith('Content-Length:')) {
-            return;
-        }
-        const message = JSON.parse(messageString);
-        this.logger.log('processMessage', message);
-        if (this.isResponse(message)) {
-            this.resolveResponse(message, message.request_seq, message.success);
+    executeWithoutWaitingForResponse(command, args) {
+        this.executeImpl(command, args, {
+            isAsync: false,
+            token: undefined,
+            expectsResult: false,
+        });
+    }
+    executeAsync(command, args, token) {
+        return this.executeImpl(command, args, {
+            isAsync: true,
+            token,
+            expectsResult: true,
+        })[0];
+    }
+    executeImpl(command, args, executeInfo) {
+        if (this.primaryTsServer) {
+            return this.primaryTsServer.executeImpl(command, args, executeInfo);
         }
-        else if (this.isEvent(message)) {
-            if (this.isRequestCompletedEvent(message)) {
-                this.resolveResponse(message, message.body.request_seq, true);
-            }
-            else {
-                if (this.options.onEvent) {
-                    this.options.onEvent(message);
-                }
-            }
+        else {
+            return [Promise.resolve(ServerResponse.NoServer)];
         }
     }
-    resolveResponse(message, request_seq, success) {
-        const deferred = this.deferreds[request_seq];
-        this.logger.log('request completed', { request_seq, success });
-        if (deferred) {
-            if (success) {
-                this.deferreds[request_seq].resolve(message);
-            }
-            else {
-                this.deferreds[request_seq].reject(message);
+    fatalError(command, error) {
+        this.tsserverLogger.error(`A non-recoverable error occurred while executing command: ${command}`);
+        if (error instanceof TypeScriptServerError && error.serverErrorText) {
+            this.tsserverLogger.error(error.serverErrorText);
+        }
+        if (this.primaryTsServer) {
+            this.logger.info('Killing TS Server');
+            this.primaryTsServer.kill();
+            if (error instanceof TypeScriptServerError) {
+                this.primaryTsServer = null;
             }
-            delete this.deferreds[request_seq];
         }
     }
-    isEvent(message) {
-        return message.type === 'event';
-    }
-    isResponse(message) {
-        return message.type === 'response';
-    }
-    isRequestCompletedEvent(message) {
-        return this.isEvent(message) && message.event === 'requestCompleted';
-    }
 }
 //# sourceMappingURL=tsp-client.js.map

package/lib/tsp-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"tsp-client.js","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tsp-client.js","sourceRoot":"","sources":["../src/tsp-client.ts"],"names":[],"mappings":"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"}

package/lib/tsp-client.spec.js

@@ -7,18 +7,23 @@
 import * as chai from 'chai';
 import { TspClient } from './tsp-client.js';
 import { ConsoleLogger } from './logger.js';
-import { filePath, readContents } from './test-utils.js';
-import API from './utils/api.js';
-import { TypeScriptVersionProvider } from './utils/versionProvider.js';
+import { filePath, readContents, TestLspClient, uri } from './test-utils.js';
+import { TypeScriptVersionProvider } from './tsServer/versionProvider.js';
 const assert = chai.assert;
 const typescriptVersionProvider = new TypeScriptVersionProvider();
 const bundled = typescriptVersionProvider.bundledVersion();
+const logger = new ConsoleLogger();
+const lspClientOptions = {
+    rootUri: uri(),
+    publishDiagnostics: () => { },
+};
+const lspClient = new TestLspClient(lspClientOptions, logger);
 let server;
 before(() => {
     server = new TspClient({
-        apiVersion: API.defaultVersion,
-        logger: new ConsoleLogger(),
-        tsserverPath: bundled.tsServerPath,
+        logger,
+        lspClient,
+        typescriptVersion: bundled,
     });
 });
 after(() => {

package/lib/tsp-client.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"tsp-client.spec.js","sourceRoot":"","sources":["../src/tsp-client.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tsp-client.spec.js","sourceRoot":"","sources":["../src/tsp-client.spec.ts"],"names":[],"mappings":"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"}

package/lib/utils/api.d.ts

@@ -36,6 +36,7 @@ export default class API {
     static readonly v420: API;
     static readonly v430: API;
     static readonly v440: API;
+    static readonly v460: API;
     static readonly v470: API;
     static fromVersionString(versionString: string): API;
     private constructor();

package/lib/utils/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,OAAO,GAAG;IA8ChB;;OAEG;aACa,WAAW,EAAE,MAAM;IAEnC;;OAEG;aACa,OAAO,EAAE,MAAM;IAE/B;;OAEG;aACa,iBAAiB,EAAE,MAAM;WA1D/B,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG;IAIlD,gBAAuB,cAAc,MAAiC;IACtE,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;WAE9C,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,GAAG;IAc3D,OAAO;IAiBA,EAAE,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAIvB,GAAG,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAIxB,EAAE,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;CAGjC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,OAAO,GAAG;IA+ChB;;OAEG;aACa,WAAW,EAAE,MAAM;IAEnC;;OAEG;aACa,OAAO,EAAE,MAAM;IAE/B;;OAEG;aACa,iBAAiB,EAAE,MAAM;WA3D/B,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG;IAIlD,gBAAuB,cAAc,MAAiC;IACtE,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;IAC5D,gBAAuB,IAAI,MAAiC;WAE9C,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,GAAG;IAc3D,OAAO;IAiBA,EAAE,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAIvB,GAAG,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAIxB,EAAE,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;CAGjC"}

package/lib/utils/api.js

@@ -70,5 +70,6 @@ API.v401 = API.fromSimpleString('4.0.1');
 API.v420 = API.fromSimpleString('4.2.0');
 API.v430 = API.fromSimpleString('4.3.0');
 API.v440 = API.fromSimpleString('4.4.0');
+API.v460 = API.fromSimpleString('4.6.0');
 API.v470 = API.fromSimpleString('4.7.0');
 //# sourceMappingURL=api.js.map

package/lib/utils/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,CAAC,OAAO,OAAO,GAAG;IA6CpB;IACI;;OAEG;IACa,WAAmB;IAEnC;;OAEG;IACa,OAAe;IAE/B;;OAEG;IACa,iBAAyB;QAVzB,gBAAW,GAAX,WAAW,CAAQ;QAKnB,YAAO,GAAP,OAAO,CAAQ;QAKf,sBAAiB,GAAjB,iBAAiB,CAAQ;IACzC,CAAC;IA3DE,MAAM,CAAC,gBAAgB,CAAC,KAAa;QACxC,OAAO,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IA4BM,MAAM,CAAC,iBAAiB,CAAC,aAAqB;QACjD,IAAI,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,IAAI,GAAG,CAAC,iBAAiB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SACvD;QAED,0EAA0E;QAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,KAAK,IAAI,CAAC,EAAE;YACZ,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;SACtC;QACD,OAAO,IAAI,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAC1D,CAAC;IAmBM,EAAE,CAAC,KAAU;QAChB,OAAO,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAEM,GAAG,CAAC,KAAU;QACjB,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAEM,EAAE,CAAC,KAAU;QAChB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;;AAnEsB,kBAAc,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAC/C,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,CAAC,OAAO,OAAO,GAAG;IA8CpB;IACI;;OAEG;IACa,WAAmB;IAEnC;;OAEG;IACa,OAAe;IAE/B;;OAEG;IACa,iBAAyB;QAVzB,gBAAW,GAAX,WAAW,CAAQ;QAKnB,YAAO,GAAP,OAAO,CAAQ;QAKf,sBAAiB,GAAjB,iBAAiB,CAAQ;IACzC,CAAC;IA5DE,MAAM,CAAC,gBAAgB,CAAC,KAAa;QACxC,OAAO,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IA6BM,MAAM,CAAC,iBAAiB,CAAC,aAAqB;QACjD,IAAI,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,IAAI,GAAG,CAAC,iBAAiB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SACvD;QAED,0EAA0E;QAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,KAAK,IAAI,CAAC,EAAE;YACZ,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;SACtC;QACD,OAAO,IAAI,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAC1D,CAAC;IAmBM,EAAE,CAAC,KAAU;QAChB,OAAO,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAEM,GAAG,CAAC,KAAU;QACjB,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAEM,EAAE,CAAC,KAAU;QAChB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;;AApEsB,kBAAc,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAC/C,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACrC,QAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC"}

package/lib/utils/modules-resolver.spec.js

@@ -2,8 +2,8 @@ import * as chai from 'chai';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { findPathToModule } from './modules-resolver.js';
-import { MODULE_FOLDERS } from './versionProvider.js';
 import { PACKAGE_ROOT } from '../test-utils.js';
+import { MODULE_FOLDERS } from '../tsServer/versionProvider.js';
 export const CURDIR = dirname(fileURLToPath(import.meta.url));
 describe('findPathToModule', () => {
     it('resolves tsserver in own directory', () => {

package/lib/utils/modules-resolver.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"modules-resolver.spec.js","sourceRoot":"","sources":["../../src/utils/modules-resolver.spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,CAAC,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE9D,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC1C,MAAM,YAAY,GAAG,gBAAgB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC7C,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"modules-resolver.spec.js","sourceRoot":"","sources":["../../src/utils/modules-resolver.spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,MAAM,CAAC,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE9D,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC1C,MAAM,YAAY,GAAG,gBAAgB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC7C,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-language-server",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Language Server Protocol (LSP) implementation for TypeScript using tsserver",
   "author": "TypeFox and others",
   "license": "Apache-2.0",
@@ -42,6 +42,7 @@
   },
   "dependencies": {
     "commander": "^9.4.0",
+    "deepmerge": "^4.2.2",
     "fs-extra": "^10.1.0",
     "p-debounce": "^4.0.0",
     "pkg-up": "^4.0.0",
@@ -49,7 +50,7 @@
     "tempy": "^3.0.0",
     "vscode-languageserver": "^8.0.2",
     "vscode-languageserver-protocol": "^3.17.2",
-    "vscode-languageserver-textdocument": "1.0.5",
+    "vscode-languageserver-textdocument": "1.0.7",
     "vscode-uri": "^3.0.3",
     "which": "^2.0.2"
   },
@@ -58,21 +59,20 @@
     "@types/deepmerge": "^2.2.0",
     "@types/fs-extra": "^9.0.13",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^16.11.52",
+    "@types/node": "^16.11.56",
     "@types/semver": "^7.3.12",
     "@types/which": "^2.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.33.1",
-    "@typescript-eslint/parser": "^5.33.1",
+    "@typescript-eslint/eslint-plugin": "^5.36.1",
+    "@typescript-eslint/parser": "^5.36.1",
     "chai": "^4.3.6",
     "concurrently": "^7.3.0",
     "cross-env": "^7.0.3",
-    "deepmerge": "^4.2.2",
-    "eslint": "^8.22.0",
+    "eslint": "^8.23.0",
     "husky": "4.x",
     "mocha": "^10.0.0",
     "rimraf": "^3.0.2",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.1",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.2"
   }
 }

package/lib/utils/versionProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"versionProvider.d.ts","sourceRoot":"","sources":["../../src/utils/versionProvider.ts"],"names":[],"mappings":"AASA,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,0BAAkB,uBAAuB;IACrC,OAAO,YAAY;IACnB,WAAW,iBAAiB;IAC5B,SAAS,cAAc;CAC1B;AAED,qBAAa,iBAAiB;aAGN,MAAM,EAAE,uBAAuB;aAC/B,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAL5B,OAAO,CAAC,IAAI,CAAyB;gBAEjB,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,MAAM,EACX,UAAU,CAAC,oBAAQ,EACnB,MAAM,CAAC,oBAAQ;IAKpC,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,SAAS,IAAI,MAAM,CAE7B;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,OAAO,IAAI,GAAG,GAAG,IAAI,CAM/B;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAGxC;IAED,OAAO,CAAC,oBAAoB;CA0C/B;AAED,eAAO,MAAM,cAAc,UAAgG,CAAC;AAE5H,qBAAa,yBAAyB;IACf,OAAO,CAAC,aAAa,CAAC;IAAkB,OAAO,CAAC,MAAM,CAAC;gBAA/C,aAAa,CAAC,4BAAgB,EAAU,MAAM,CAAC,oBAAQ;IAE3E,qBAAqB,IAAI,iBAAiB,GAAG,IAAI;IA8CjD,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,iBAAiB,GAAG,IAAI;IAazE,cAAc,IAAI,iBAAiB,GAAG,IAAI;CAcpD"}

package/lib/utils/versionProvider.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"versionProvider.js","sourceRoot":"","sources":["../../src/utils/versionProvider.ts"],"names":[],"mappings":"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"}