typescript-language-server 0.11.2 → 1.1.1

package/lib/test-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAKzC,wBAAgB,4BAA4B,IAAI,GAAG,CAAC,kBAAkB,CAiBrE;AAED,wBAAgB,GAAG,CAAC,GAAG,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAGnD;AAED,wBAAgB,QAAQ,CAAC,GAAG,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAExD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAOpF;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAEpF;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAEzF;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAExF;AAED,qBAAa,aAAc,SAAQ,SAAS;IACxC,cAAc,EAAE,GAAG,CAAC,wBAAwB,EAAE,CAAM;CACvD;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE;IACxC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,kBAAkB,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI,CAAC;IACjE,0BAA0B,CAAC,EAAE,GAAG,CAAC,kBAAkB,CAAC;CACvD,GAAG,OAAO,CAAC,aAAa,CAAC,CA4CzB"}
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAI7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,eAAO,MAAM,YAAY,QAAgD,CAAC;AA4C1E,wBAAgB,GAAG,CAAC,GAAG,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAGnD;AAED,wBAAgB,QAAQ,CAAC,GAAG,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAExD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAOpF;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAEpF;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAEzF;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAExF;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKlD;AAiDD,qBAAa,aAAc,SAAQ,SAAS;IACxC,cAAc,EAAE,GAAG,CAAC,wBAAwB,EAAE,CAAM;CACvD;AAED,UAAU,oBAAoB;IAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,kBAAkB,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,wBAAwB,KAAK,IAAI,CAAC;IACjE,0BAA0B,CAAC,EAAE,GAAG,CAAC,kBAAkB,CAAC;CACvD;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CA0BxF"}

package/lib/test-utils.js

@@ -1,159 +1,164 @@
-"use strict";
 /*
  * 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
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServer = exports.TestLspServer = exports.lastPosition = exports.positionAfter = exports.position = exports.positionAt = exports.readContents = exports.filePath = exports.uri = exports.getDefaultClientCapabilities = void 0;
-const path = __importStar(require("path"));
-const fs = __importStar(require("fs"));
-const lsp = __importStar(require("vscode-languageserver/node"));
-const protocol_translation_1 = require("./protocol-translation");
-const lsp_server_1 = require("./lsp-server");
-const logger_1 = require("./logger");
-const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
-const versionProvider_1 = require("./utils/versionProvider");
-function getDefaultClientCapabilities() {
-    return {
-        textDocument: {
-            documentSymbol: {
-                hierarchicalDocumentSymbolSupport: true
+import { platform } from 'node:os';
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import deepmerge from 'deepmerge';
+import * as lsp from 'vscode-languageserver';
+import { normalizePath, pathToUri } from './protocol-translation.js';
+import { LspServer } from './lsp-server.js';
+import { ConsoleLogger } from './logger.js';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { TypeScriptVersionProvider } from './utils/versionProvider.js';
+const CONSOLE_LOG_LEVEL = ConsoleLogger.toMessageTypeLevel(process.env.CONSOLE_LOG_LEVEL);
+export const PACKAGE_ROOT = fileURLToPath(new URL('..', import.meta.url));
+const DEFAULT_TEST_CLIENT_CAPABILITIES = {
+    textDocument: {
+        completion: {
+            completionItem: {
+                snippetSupport: true,
+                labelDetailsSupport: true,
             },
-            publishDiagnostics: {
-                tagSupport: {
-                    valueSet: [
-                        lsp.DiagnosticTag.Unnecessary,
-                        lsp.DiagnosticTag.Deprecated
-                    ]
-                }
+        },
+        documentSymbol: {
+            hierarchicalDocumentSymbolSupport: true,
+        },
+        publishDiagnostics: {
+            tagSupport: {
+                valueSet: [
+                    lsp.DiagnosticTag.Unnecessary,
+                    lsp.DiagnosticTag.Deprecated,
+                ],
             },
-            moniker: {}
-        }
-    };
-}
-exports.getDefaultClientCapabilities = getDefaultClientCapabilities;
-function uri(...components) {
+        },
+        moniker: {},
+    },
+};
+const DEFAULT_TEST_CLIENT_INITIALIZATION_OPTIONS = {
+    plugins: [],
+    preferences: {
+        allowIncompleteCompletions: true,
+        allowRenameOfImportPath: true,
+        allowTextChangesInNewFiles: true,
+        displayPartsForJSDoc: true,
+        generateReturnInDocTemplate: true,
+        includeAutomaticOptionalChainCompletions: true,
+        includeCompletionsForImportStatements: true,
+        includeCompletionsForModuleExports: true,
+        includeCompletionsWithClassMemberSnippets: true,
+        includeCompletionsWithInsertText: true,
+        includeCompletionsWithSnippetText: true,
+        jsxAttributeCompletionStyle: 'auto',
+        providePrefixAndSuffixTextForRename: true,
+    },
+};
+export function uri(...components) {
     const resolved = filePath(...components);
-    return (0, protocol_translation_1.pathToUri)(resolved, undefined);
+    return pathToUri(resolved, undefined);
 }
-exports.uri = uri;
-function filePath(...components) {
-    return (0, protocol_translation_1.normalizePath)(path.resolve(__dirname, '..', 'test-data', ...components));
+export function filePath(...components) {
+    return normalizePath(path.resolve(PACKAGE_ROOT, 'test-data', ...components));
 }
-exports.filePath = filePath;
-function readContents(path) {
+export function readContents(path) {
     return fs.readFileSync(path, 'utf-8').toString();
 }
-exports.readContents = readContents;
-function positionAt(document, idx) {
-    const doc = vscode_languageserver_textdocument_1.TextDocument.create(document.uri, document.languageId, document.version, document.text);
+export function positionAt(document, idx) {
+    const doc = TextDocument.create(document.uri, document.languageId, document.version, document.text);
     const pos = doc.positionAt(idx);
     return {
         line: pos.line,
-        character: pos.character
+        character: pos.character,
     };
 }
-exports.positionAt = positionAt;
-function position(document, match) {
+export function position(document, match) {
     return positionAt(document, document.text.indexOf(match));
 }
-exports.position = position;
-function positionAfter(document, match) {
+export function positionAfter(document, match) {
     return positionAt(document, document.text.indexOf(match) + match.length);
 }
-exports.positionAfter = positionAfter;
-function lastPosition(document, match) {
+export function lastPosition(document, match) {
     return positionAt(document, document.text.lastIndexOf(match));
 }
-exports.lastPosition = lastPosition;
-class TestLspServer extends lsp_server_1.LspServer {
+export function toPlatformEOL(text) {
+    if (platform() === 'win32') {
+        return text.replace(/(?!\r)\n/g, '\r\n');
+    }
+    return text;
+}
+class TestLspClient {
+    constructor(options, logger) {
+        this.options = options;
+        this.logger = logger;
+        this.workspaceEditsListener = null;
+    }
+    async createProgressReporter(_token, _workDoneProgress) {
+        const reporter = new class {
+            begin(_title, _percentage, _message, _cancellable) { }
+            report(_message) { }
+            done() { }
+        };
+        return reporter;
+    }
+    async withProgress(_options, task) {
+        const progress = await this.createProgressReporter();
+        return await task(progress);
+    }
+    publishDiagnostics(args) {
+        return this.options.publishDiagnostics(args);
+    }
+    showErrorMessage(message) {
+        this.logger.error(`[showErrorMessage] ${message}`);
+    }
+    logMessage(args) {
+        this.logger.log('logMessage', JSON.stringify(args));
+    }
+    addApplyWorkspaceEditListener(listener) {
+        this.workspaceEditsListener = listener;
+    }
+    async applyWorkspaceEdit(args) {
+        if (this.workspaceEditsListener) {
+            this.workspaceEditsListener(args);
+        }
+        return { applied: true };
+    }
+    async rename() {
+        throw new Error('unsupported');
+    }
+}
+export class TestLspServer extends LspServer {
     constructor() {
         super(...arguments);
         this.workspaceEdits = [];
     }
 }
-exports.TestLspServer = TestLspServer;
-function createServer(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const typescriptVersionProvider = new versionProvider_1.TypeScriptVersionProvider();
-        const bundled = typescriptVersionProvider.bundledVersion();
-        const logger = new logger_1.ConsoleLogger(false);
-        const server = new TestLspServer({
-            logger,
-            tsserverPath: bundled.tsServerPath,
-            tsserverLogVerbosity: options.tsserverLogVerbosity,
-            tsserverLogFile: path.resolve(__dirname, '../tsserver.log'),
-            lspClient: {
-                setClientCapabilites() { },
-                createProgressReporter() {
-                    return {
-                        begin() { },
-                        report() { },
-                        end() { }
-                    };
-                },
-                publishDiagnostics: options.publishDiagnostics,
-                showMessage(args) {
-                    throw args; // should not be called.
-                },
-                logMessage(args) {
-                    logger.log('logMessage', JSON.stringify(args));
-                },
-                telemetry(args) {
-                    logger.log('telemetry', JSON.stringify(args));
-                },
-                applyWorkspaceEdit(args) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        server.workspaceEdits.push(args);
-                        return { applied: true };
-                    });
-                },
-                rename: () => Promise.reject(new Error('unsupported'))
-            }
-        });
-        yield server.initialize({
-            rootPath: undefined,
-            rootUri: options.rootUri,
-            processId: 42,
-            capabilities: options.clientCapabilitiesOverride || getDefaultClientCapabilities(),
-            workspaceFolders: null
-        });
-        return server;
+export async function createServer(options) {
+    const typescriptVersionProvider = new TypeScriptVersionProvider();
+    const bundled = typescriptVersionProvider.bundledVersion();
+    const logger = new ConsoleLogger(CONSOLE_LOG_LEVEL);
+    const lspClient = new TestLspClient(options, logger);
+    const server = new TestLspServer({
+        logger,
+        tsserverPath: bundled.tsServerPath,
+        tsserverLogVerbosity: options.tsserverLogVerbosity,
+        tsserverLogFile: path.resolve(PACKAGE_ROOT, 'tsserver.log'),
+        lspClient,
+    });
+    lspClient.addApplyWorkspaceEditListener(args => {
+        server.workspaceEdits.push(args);
+    });
+    await server.initialize({
+        rootPath: undefined,
+        rootUri: options.rootUri,
+        processId: 42,
+        capabilities: deepmerge(DEFAULT_TEST_CLIENT_CAPABILITIES, options.clientCapabilitiesOverride || {}),
+        initializationOptions: DEFAULT_TEST_CLIENT_INITIALIZATION_OPTIONS,
+        workspaceFolders: null,
     });
+    return server;
 }
-exports.createServer = createServer;
 //# sourceMappingURL=test-utils.js.map

package/lib/test-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGrE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,MAAM,iBAAiB,GAAG,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC1F,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1E,MAAM,gCAAgC,GAA2B;IAC7D,YAAY,EAAE;QACV,UAAU,EAAE;YACR,cAAc,EAAE;gBACZ,cAAc,EAAE,IAAI;gBACpB,mBAAmB,EAAE,IAAI;aAC5B;SACJ;QACD,cAAc,EAAE;YACZ,iCAAiC,EAAE,IAAI;SAC1C;QACD,kBAAkB,EAAE;YAChB,UAAU,EAAE;gBACR,QAAQ,EAAE;oBACN,GAAG,CAAC,aAAa,CAAC,WAAW;oBAC7B,GAAG,CAAC,aAAa,CAAC,UAAU;iBAC/B;aACJ;SACJ;QACD,OAAO,EAAE,EAAE;KACd;CACJ,CAAC;AAEF,MAAM,0CAA0C,GAAoC;IAChF,OAAO,EAAE,EAAE;IACX,WAAW,EAAE;QACT,0BAA0B,EAAE,IAAI;QAChC,uBAAuB,EAAE,IAAI;QAC7B,0BAA0B,EAAE,IAAI;QAChC,oBAAoB,EAAE,IAAI;QAC1B,2BAA2B,EAAE,IAAI;QACjC,wCAAwC,EAAE,IAAI;QAC9C,qCAAqC,EAAE,IAAI;QAC3C,kCAAkC,EAAE,IAAI;QACxC,yCAAyC,EAAE,IAAI;QAC/C,gCAAgC,EAAE,IAAI;QACtC,iCAAiC,EAAE,IAAI;QACvC,2BAA2B,EAAE,MAAM;QACnC,mCAAmC,EAAE,IAAI;KAC5C;CACJ,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,GAAG,UAAoB;IACvC,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,UAAU,CAAC,CAAC;IACzC,OAAO,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAG,UAAoB;IAC5C,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAY;IACrC,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,QAA8B,EAAE,GAAW;IAClE,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpG,MAAM,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,OAAO;QACH,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,SAAS,EAAE,GAAG,CAAC,SAAS;KAC3B,CAAC;AACN,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,QAA8B,EAAE,KAAa;IAClE,OAAO,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAA8B,EAAE,KAAa;IACvE,OAAO,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAA8B,EAAE,KAAa;IACtE,OAAO,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY;IACtC,IAAI,QAAQ,EAAE,KAAK,OAAO,EAAE;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;KAC5C;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,MAAM,aAAa;IAGf,YAAsB,OAA6B,EAAY,MAAqB;QAA9D,YAAO,GAAP,OAAO,CAAsB;QAAY,WAAM,GAAN,MAAM,CAAe;QAF5E,2BAAsB,GAA0D,IAAI,CAAC;IAEN,CAAC;IAExF,KAAK,CAAC,sBAAsB,CAAC,MAA8B,EAAE,iBAAgD;QACzG,MAAM,QAAQ,GAAG,IAAI;YACjB,KAAK,CAAC,MAAc,EAAE,WAAoB,EAAE,QAAiB,EAAE,YAAsB,IAAS,CAAC;YAC/F,MAAM,CAAC,QAAa,IAAS,CAAC;YAC9B,IAAI,KAAU,CAAC;SAClB,CAAC;QACF,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,YAAY,CAAW,QAA6B,EAAE,IAA4D;QACpH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACrD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED,kBAAkB,CAAC,IAAkC;QACjD,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,gBAAgB,CAAC,OAAe;QAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,UAAU,CAAC,IAA0B;QACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,6BAA6B,CAAC,QAAsD;QAChF,IAAI,CAAC,sBAAsB,GAAG,QAAQ,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAkC;QACvD,IAAI,IAAI,CAAC,sBAAsB,EAAE;YAC7B,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;SACrC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;CACJ;AAED,MAAM,OAAO,aAAc,SAAQ,SAAS;IAA5C;;QACI,mBAAc,GAAmC,EAAE,CAAC;IACxD,CAAC;CAAA;AASD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAA6B;IAC5D,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,EAAE,CAAC;IAClE,MAAM,OAAO,GAAG,yBAAyB,CAAC,cAAc,EAAE,CAAC;IAC3D,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,IAAI,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC;QAC7B,MAAM;QACN,YAAY,EAAE,OAAQ,CAAC,YAAY;QACnC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;QAClD,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC;QAC3D,SAAS;KACZ,CAAC,CAAC;IAEH,SAAS,CAAC,6BAA6B,CAAC,IAAI,CAAC,EAAE;QAC3C,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,UAAU,CAAC;QACpB,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,EAAE;QACb,YAAY,EAAE,SAAS,CAAC,gCAAgC,EAAE,OAAO,CAAC,0BAA0B,IAAI,EAAE,CAAC;QACnG,qBAAqB,EAAE,0CAA0C;QACjE,gBAAgB,EAAE,IAAI;KACzB,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/lib/ts-protocol.d.ts

@@ -2,8 +2,7 @@
  * **IMPORTANT** this module should not depend on `vscode-languageserver` only protocol and types
  */
 import * as lsp from 'vscode-languageserver-protocol';
-import { FormatCodeSettings, UserPreferences } from 'typescript/lib/protocol';
-import { InlayHintsOptions } from './lsp-protocol.inlayHints.proposed';
+import type tsp from 'typescript/lib/protocol.d.js';
 export declare namespace TypeScriptRenameRequest {
     const type: lsp.RequestType<lsp.TextDocumentPositionParams, void, void>;
 }
@@ -15,6 +14,12 @@ export declare class DisplayPartKind {
     static readonly punctuation = "punctuation";
     static readonly text = "text";
 }
+export interface SupportedFeatures {
+    completionLabelDetails?: boolean;
+    completionSnippets?: boolean;
+    diagnosticsTagSupport?: boolean;
+    definitionLinkSupport?: boolean;
+}
 export interface TypeScriptPlugin {
     name: string;
     location: string;
@@ -26,7 +31,7 @@ export interface TypeScriptInitializationOptions {
     npmLocation?: string;
     locale?: string;
     plugins: TypeScriptPlugin[];
-    preferences?: UserPreferences;
+    preferences?: tsp.UserPreferences;
     hostInfo?: string;
 }
 export declare type TypeScriptInitializeParams = lsp.InitializeParams & {
@@ -35,21 +40,4 @@ export declare type TypeScriptInitializeParams = lsp.InitializeParams & {
 export interface TypeScriptInitializeResult extends lsp.InitializeResult {
     logFileUri?: string;
 }
-export interface TypeScriptWorkspaceSettingsLanguageSettings {
-    format?: FormatCodeSettings;
-    inlayHints?: InlayHintsOptions;
-}
-interface TypeScriptWorkspaceSettingsDiagnostics {
-    ignoredCodes?: number[];
-}
-export interface TypeScriptWorkspaceSettings {
-    javascript?: TypeScriptWorkspaceSettingsLanguageSettings;
-    typescript?: TypeScriptWorkspaceSettingsLanguageSettings;
-    completions?: CompletionOptions;
-    diagnostics?: TypeScriptWorkspaceSettingsDiagnostics;
-}
-export interface CompletionOptions {
-    completeFunctionCalls?: boolean;
-}
-export {};
 //# sourceMappingURL=ts-protocol.d.ts.map

package/lib/ts-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-protocol.d.ts","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAEvE,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,IAAI,6DAAwF,CAAC;CAC7G;AAED,qBAAa,eAAe;IACxB,gBAAuB,YAAY,kBAAkB;IACrD,gBAAuB,UAAU,gBAAgB;IACjD,gBAAuB,aAAa,mBAAmB;IACvD,gBAAuB,YAAY,kBAAkB;IACrD,gBAAuB,WAAW,iBAAiB;IACnD,gBAAuB,IAAI,UAAU;CACxC;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC5C,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,oBAAY,0BAA0B,GAAG,GAAG,CAAC,gBAAgB,GAAG;IAC5D,qBAAqB,CAAC,EAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;CACpE,CAAC;AAEF,MAAM,WAAW,0BAA2B,SAAQ,GAAG,CAAC,gBAAgB;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,2CAA2C;IACxD,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAClC;AAED,UAAU,sCAAsC;IAC5C,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,2BAA2B;IACxC,UAAU,CAAC,EAAE,2CAA2C,CAAC;IACzD,UAAU,CAAC,EAAE,2CAA2C,CAAC;IACzD,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,WAAW,CAAC,EAAE,sCAAsC,CAAC;CACxD;AAED,MAAM,WAAW,iBAAiB;IAC9B,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACnC"}
+{"version":3,"file":"ts-protocol.d.ts","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,gCAAgC,CAAC;AACtD,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AAEpD,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,IAAI,6DAAwF,CAAC;CAC7G;AAED,qBAAa,eAAe;IACxB,gBAAuB,YAAY,kBAAkB;IACrD,gBAAuB,UAAU,gBAAgB;IACjD,gBAAuB,aAAa,mBAAmB;IACvD,gBAAuB,YAAY,kBAAkB;IACrD,gBAAuB,WAAW,iBAAiB;IACnD,gBAAuB,IAAI,UAAU;CACxC;AAED,MAAM,WAAW,iBAAiB;IAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC5C,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,oBAAY,0BAA0B,GAAG,GAAG,CAAC,gBAAgB,GAAG;IAC5D,qBAAqB,CAAC,EAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;CACpE,CAAC;AAEF,MAAM,WAAW,0BAA2B,SAAQ,GAAG,CAAC,gBAAgB;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB"}

package/lib/ts-protocol.js

@@ -1,46 +1,19 @@
-"use strict";
 /*
  * Copyright (C) 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
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DisplayPartKind = exports.TypeScriptRenameRequest = void 0;
 /**
  * **IMPORTANT** this module should not depend on `vscode-languageserver` only protocol and types
  */
-const lsp = __importStar(require("vscode-languageserver-protocol"));
-var TypeScriptRenameRequest;
+import * as lsp from 'vscode-languageserver-protocol';
+export var TypeScriptRenameRequest;
 (function (TypeScriptRenameRequest) {
     TypeScriptRenameRequest.type = new lsp.RequestType('_typescript.rename');
-})(TypeScriptRenameRequest = exports.TypeScriptRenameRequest || (exports.TypeScriptRenameRequest = {}));
-class DisplayPartKind {
+})(TypeScriptRenameRequest = TypeScriptRenameRequest || (TypeScriptRenameRequest = {}));
+export class DisplayPartKind {
 }
-exports.DisplayPartKind = DisplayPartKind;
 DisplayPartKind.functionName = 'functionName';
 DisplayPartKind.methodName = 'methodName';
 DisplayPartKind.parameterName = 'parameterName';

package/lib/ts-protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts-protocol.js","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH;;GAEG;AACH,oEAAsD;AAItD,IAAiB,uBAAuB,CAEvC;AAFD,WAAiB,uBAAuB;IACvB,4BAAI,GAAG,IAAI,GAAG,CAAC,WAAW,CAA6C,oBAAoB,CAAC,CAAC;AAC9G,CAAC,EAFgB,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAEvC;AAED,MAAa,eAAe;;AAA5B,0CAOC;AAN0B,4BAAY,GAAG,cAAc,CAAC;AAC9B,0BAAU,GAAG,YAAY,CAAC;AAC1B,6BAAa,GAAG,eAAe,CAAC;AAChC,4BAAY,GAAG,cAAc,CAAC;AAC9B,2BAAW,GAAG,aAAa,CAAC;AAC5B,oBAAI,GAAG,MAAM,CAAC"}
+{"version":3,"file":"ts-protocol.js","sourceRoot":"","sources":["../src/ts-protocol.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,gCAAgC,CAAC;AAGtD,MAAM,KAAW,uBAAuB,CAEvC;AAFD,WAAiB,uBAAuB;IACvB,4BAAI,GAAG,IAAI,GAAG,CAAC,WAAW,CAA6C,oBAAoB,CAAC,CAAC;AAC9G,CAAC,EAFgB,uBAAuB,GAAvB,uBAAuB,KAAvB,uBAAuB,QAEvC;AAED,MAAM,OAAO,eAAe;;AACD,4BAAY,GAAG,cAAc,CAAC;AAC9B,0BAAU,GAAG,YAAY,CAAC;AAC1B,6BAAa,GAAG,eAAe,CAAC;AAChC,4BAAY,GAAG,cAAc,CAAC;AAC9B,2BAAW,GAAG,aAAa,CAAC;AAC5B,oBAAI,GAAG,MAAM,CAAC"}

package/lib/tsp-client.d.ts

@@ -1,9 +1,11 @@
-/// <reference types="node" />
-import protocol from 'typescript/lib/protocol';
-import { CommandTypes } from './tsp-command-types';
-import { Logger } from './logger';
+/// <reference types="node" resolution-mode="require"/>
+import type tsp from 'typescript/lib/protocol.d.js';
 import { CancellationToken } from 'vscode-jsonrpc';
+import { CommandTypes } from './tsp-command-types.js';
+import { Logger } from './logger.js';
+import API from './utils/api.js';
 export interface TspClientOptions {
+    apiVersion: API;
     logger: Logger;
     tsserverPath: string;
     logFile?: string;
@@ -14,48 +16,49 @@ export interface TspClientOptions {
     locale?: string;
     globalPlugins?: string[];
     pluginProbeLocations?: string[];
-    onEvent?: (event: protocol.Event) => void;
+    onEvent?: (event: tsp.Event) => void;
     onExit?: (exitCode: number | null, signal: NodeJS.Signals | null) => void;
 }
 interface TypeScriptRequestTypes {
-    'geterr': [protocol.GeterrRequestArgs, any];
-    'compilerOptionsForInferredProjects': [protocol.SetCompilerOptionsForInferredProjectsArgs, protocol.SetCompilerOptionsForInferredProjectsResponse];
-    'documentHighlights': [protocol.DocumentHighlightsRequestArgs, protocol.DocumentHighlightsResponse];
-    'applyCodeActionCommand': [protocol.ApplyCodeActionCommandRequestArgs, protocol.ApplyCodeActionCommandResponse];
-    'completionEntryDetails': [protocol.CompletionDetailsRequestArgs, protocol.CompletionDetailsResponse];
-    'completionInfo': [protocol.CompletionsRequestArgs, protocol.CompletionInfoResponse];
-    'configure': [protocol.ConfigureRequestArguments, protocol.ConfigureResponse];
-    'definition': [protocol.FileLocationRequestArgs, protocol.DefinitionResponse];
-    'definitionAndBoundSpan': [protocol.FileLocationRequestArgs, protocol.DefinitionInfoAndBoundSpanReponse];
-    'docCommentTemplate': [protocol.FileLocationRequestArgs, protocol.DocCommandTemplateResponse];
-    'format': [protocol.FormatRequestArgs, protocol.FormatResponse];
-    'formatonkey': [protocol.FormatOnKeyRequestArgs, protocol.FormatResponse];
-    'getApplicableRefactors': [protocol.GetApplicableRefactorsRequestArgs, protocol.GetApplicableRefactorsResponse];
-    'getCodeFixes': [protocol.CodeFixRequestArgs, protocol.CodeFixResponse];
-    'getCombinedCodeFix': [protocol.GetCombinedCodeFixRequestArgs, protocol.GetCombinedCodeFixResponse];
-    'getEditsForFileRename': [protocol.GetEditsForFileRenameRequestArgs, protocol.GetEditsForFileRenameResponse];
-    'getEditsForRefactor': [protocol.GetEditsForRefactorRequestArgs, protocol.GetEditsForRefactorResponse];
-    'getOutliningSpans': [protocol.FileRequestArgs, protocol.OutliningSpansResponse];
-    'getSupportedCodeFixes': [null, protocol.GetSupportedCodeFixesResponse];
-    'implementation': [protocol.FileLocationRequestArgs, protocol.ImplementationResponse];
-    'jsxClosingTag': [protocol.JsxClosingTagRequestArgs, protocol.JsxClosingTagResponse];
-    'navto': [protocol.NavtoRequestArgs, protocol.NavtoResponse];
-    'navtree': [protocol.FileRequestArgs, protocol.NavTreeResponse];
-    'occurrences': [protocol.FileLocationRequestArgs, protocol.OccurrencesResponse];
-    'organizeImports': [protocol.OrganizeImportsRequestArgs, protocol.OrganizeImportsResponse];
-    'projectInfo': [protocol.ProjectInfoRequestArgs, protocol.ProjectInfoResponse];
-    'quickinfo': [protocol.FileLocationRequestArgs, protocol.QuickInfoResponse];
-    'references': [protocol.FileLocationRequestArgs, protocol.ReferencesResponse];
-    'rename': [protocol.RenameRequestArgs, protocol.RenameResponse];
-    'signatureHelp': [protocol.SignatureHelpRequestArgs, protocol.SignatureHelpResponse];
-    'typeDefinition': [protocol.FileLocationRequestArgs, protocol.TypeDefinitionResponse];
-    'provideInlayHints': [protocol.InlayHintsRequestArgs, protocol.InlayHintsResponse];
-    'encodedSemanticClassifications-full': [protocol.EncodedSemanticClassificationsRequestArgs, protocol.EncodedSemanticClassificationsResponse];
+    [CommandTypes.ApplyCodeActionCommand]: [tsp.ApplyCodeActionCommandRequestArgs, tsp.ApplyCodeActionCommandResponse];
+    [CommandTypes.CompilerOptionsForInferredProjects]: [tsp.SetCompilerOptionsForInferredProjectsArgs, tsp.SetCompilerOptionsForInferredProjectsResponse];
+    [CommandTypes.CompletionDetails]: [tsp.CompletionDetailsRequestArgs, tsp.CompletionDetailsResponse];
+    [CommandTypes.CompletionInfo]: [tsp.CompletionsRequestArgs, tsp.CompletionInfoResponse];
+    [CommandTypes.Configure]: [tsp.ConfigureRequestArguments, tsp.ConfigureResponse];
+    [CommandTypes.Definition]: [tsp.FileLocationRequestArgs, tsp.DefinitionResponse];
+    [CommandTypes.DefinitionAndBoundSpan]: [tsp.FileLocationRequestArgs, tsp.DefinitionInfoAndBoundSpanResponse];
+    [CommandTypes.DocCommentTemplate]: [tsp.FileLocationRequestArgs, tsp.DocCommandTemplateResponse];
+    [CommandTypes.DocumentHighlights]: [tsp.DocumentHighlightsRequestArgs, tsp.DocumentHighlightsResponse];
+    [CommandTypes.EncodedSemanticClassificationsFull]: [tsp.EncodedSemanticClassificationsRequestArgs, tsp.EncodedSemanticClassificationsResponse];
+    [CommandTypes.FindSourceDefinition]: [tsp.FileLocationRequestArgs, tsp.DefinitionResponse];
+    [CommandTypes.Format]: [tsp.FormatRequestArgs, tsp.FormatResponse];
+    [CommandTypes.Formatonkey]: [tsp.FormatOnKeyRequestArgs, tsp.FormatResponse];
+    [CommandTypes.GetApplicableRefactors]: [tsp.GetApplicableRefactorsRequestArgs, tsp.GetApplicableRefactorsResponse];
+    [CommandTypes.GetCodeFixes]: [tsp.CodeFixRequestArgs, tsp.CodeFixResponse];
+    [CommandTypes.GetCombinedCodeFix]: [tsp.GetCombinedCodeFixRequestArgs, tsp.GetCombinedCodeFixResponse];
+    [CommandTypes.GetEditsForFileRename]: [tsp.GetEditsForFileRenameRequestArgs, tsp.GetEditsForFileRenameResponse];
+    [CommandTypes.GetEditsForRefactor]: [tsp.GetEditsForRefactorRequestArgs, tsp.GetEditsForRefactorResponse];
+    [CommandTypes.Geterr]: [tsp.GeterrRequestArgs, any];
+    [CommandTypes.GetOutliningSpans]: [tsp.FileRequestArgs, tsp.OutliningSpansResponse];
+    [CommandTypes.GetSupportedCodeFixes]: [null, tsp.GetSupportedCodeFixesResponse];
+    [CommandTypes.Implementation]: [tsp.FileLocationRequestArgs, tsp.ImplementationResponse];
+    [CommandTypes.JsxClosingTag]: [tsp.JsxClosingTagRequestArgs, tsp.JsxClosingTagResponse];
+    [CommandTypes.Navto]: [tsp.NavtoRequestArgs, tsp.NavtoResponse];
+    [CommandTypes.NavTree]: [tsp.FileRequestArgs, tsp.NavTreeResponse];
+    [CommandTypes.OrganizeImports]: [tsp.OrganizeImportsRequestArgs, tsp.OrganizeImportsResponse];
+    [CommandTypes.ProjectInfo]: [tsp.ProjectInfoRequestArgs, tsp.ProjectInfoResponse];
+    [CommandTypes.ProvideInlayHints]: [tsp.InlayHintsRequestArgs, tsp.InlayHintsResponse];
+    [CommandTypes.Quickinfo]: [tsp.FileLocationRequestArgs, tsp.QuickInfoResponse];
+    [CommandTypes.References]: [tsp.FileLocationRequestArgs, tsp.ReferencesResponse];
+    [CommandTypes.Rename]: [tsp.RenameRequestArgs, tsp.RenameResponse];
+    [CommandTypes.SignatureHelp]: [tsp.SignatureHelpRequestArgs, tsp.SignatureHelpResponse];
+    [CommandTypes.TypeDefinition]: [tsp.FileLocationRequestArgs, tsp.TypeDefinitionResponse];
 }
 export declare class TspClient {
     private options;
-    private readlineInterface;
+    apiVersion: API;
     private tsserverProc;
+    private readlineInterface;
     private seq;
     private readonly deferreds;
     private logger;
@@ -64,10 +67,10 @@ export declare class TspClient {
     constructor(options: TspClientOptions);
     start(): boolean;
     shutdown(): void;
-    notify(command: CommandTypes.Open, args: protocol.OpenRequestArgs): void;
-    notify(command: CommandTypes.Close, args: protocol.FileRequestArgs): void;
-    notify(command: CommandTypes.Saveto, args: protocol.SavetoRequestArgs): void;
-    notify(command: CommandTypes.Change, args: protocol.ChangeRequestArgs): void;
+    notify(command: CommandTypes.Open, args: tsp.OpenRequestArgs): void;
+    notify(command: CommandTypes.Close, args: tsp.FileRequestArgs): void;
+    notify(command: CommandTypes.Saveto, args: tsp.SavetoRequestArgs): void;
+    notify(command: CommandTypes.Change, args: tsp.ChangeRequestArgs): void;
     request<K extends keyof TypeScriptRequestTypes>(command: K, args: TypeScriptRequestTypes[K][0], token?: CancellationToken): Promise<TypeScriptRequestTypes[K][1]>;
     protected sendMessage(command: string, notification: boolean, args?: any): void;
     protected processMessage(untrimmedMessageString: string): void;

package/lib/tsp-client.d.ts.map

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