typescript-language-server 0.11.2 → 1.1.1

package/lib/utils/versionProvider.js

@@ -1,20 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeScriptVersionProvider = exports.MODULE_FOLDERS = exports.TypeScriptVersion = void 0;
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const which_1 = __importDefault(require("which"));
-const pkg_up_1 = __importDefault(require("pkg-up"));
-const api_1 = __importDefault(require("./api"));
-const modules_resolver_1 = require("./modules-resolver");
-class TypeScriptVersion {
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import which from 'which';
+import { pkgUpSync } from 'pkg-up';
+import API from './api.js';
+import { findPathToModule } from './modules-resolver.js';
+export class TypeScriptVersion {
     constructor(source, path, _pathLabel, logger) {
         this.source = source;
         this.path = path;
@@ -23,10 +18,10 @@ class TypeScriptVersion {
         this._api = null;
     }
     get tscPath() {
-        return path_1.default.resolve(this.path, '../bin/tsc');
+        return path.resolve(this.path, '../bin/tsc');
     }
     get tsServerPath() {
-        return path_1.default.resolve(this.path, 'tsserver.js');
+        return path.resolve(this.path, 'tsserver.js');
     }
     get pathLabel() {
         return typeof this._pathLabel === 'undefined' ? this.path : this._pathLabel;
@@ -46,102 +41,99 @@ class TypeScriptVersion {
         return version ? version.displayName : null;
     }
     getTypeScriptVersion(serverPath) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.info(`Resolving TypeScript version from path "${serverPath}"...`);
-        if (!fs_1.default.existsSync(serverPath)) {
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.info('Server path does not exist on disk');
+        this.logger?.info(`Resolving TypeScript version from path "${serverPath}"...`);
+        if (!fs.existsSync(serverPath)) {
+            this.logger?.info('Server path does not exist on disk');
             return null;
         }
-        const p = serverPath.split(path_1.default.sep);
+        const p = serverPath.split(path.sep);
         if (p.length <= 2) {
-            (_c = this.logger) === null || _c === void 0 ? void 0 : _c.info('Server path is invalid (has less than two path components).');
+            this.logger?.info('Server path is invalid (has less than two path components).');
             return null;
         }
         const p2 = p.slice(0, -2);
-        const modulePath = p2.join(path_1.default.sep);
-        let fileName = path_1.default.join(modulePath, 'package.json');
-        if (!fs_1.default.existsSync(fileName)) {
+        const modulePath = p2.join(path.sep);
+        let fileName = path.join(modulePath, 'package.json');
+        if (!fs.existsSync(fileName)) {
             // Special case for ts dev versions
-            if (path_1.default.basename(modulePath) === 'built') {
-                fileName = path_1.default.join(modulePath, '..', 'package.json');
+            if (path.basename(modulePath) === 'built') {
+                fileName = path.join(modulePath, '..', 'package.json');
             }
         }
-        if (!fs_1.default.existsSync(fileName)) {
-            (_d = this.logger) === null || _d === void 0 ? void 0 : _d.info(`Failed to find package.json at path "${fileName}"`);
+        if (!fs.existsSync(fileName)) {
+            this.logger?.info(`Failed to find package.json at path "${fileName}"`);
             return null;
         }
-        (_e = this.logger) === null || _e === void 0 ? void 0 : _e.info(`Reading version from package.json at "${fileName}"`);
-        const contents = fs_1.default.readFileSync(fileName).toString();
+        this.logger?.info(`Reading version from package.json at "${fileName}"`);
+        const contents = fs.readFileSync(fileName).toString();
         let desc = null;
         try {
             desc = JSON.parse(contents);
         }
         catch (err) {
-            (_f = this.logger) === null || _f === void 0 ? void 0 : _f.info('Failed parsing contents of package.json.');
+            this.logger?.info('Failed parsing contents of package.json.');
             return null;
         }
         if (!desc || !desc.version) {
-            (_g = this.logger) === null || _g === void 0 ? void 0 : _g.info('Failed reading version number from package.json.');
+            this.logger?.info('Failed reading version number from package.json.');
             return null;
         }
-        (_h = this.logger) === null || _h === void 0 ? void 0 : _h.info(`Resolved TypeScript version to "${desc.version}"`);
-        return api_1.default.fromVersionString(desc.version);
+        this.logger?.info(`Resolved TypeScript version to "${desc.version}"`);
+        return API.fromVersionString(desc.version);
     }
 }
-exports.TypeScriptVersion = TypeScriptVersion;
-exports.MODULE_FOLDERS = ['node_modules/typescript/lib', '.vscode/pnpify/typescript/lib', '.yarn/sdks/typescript/lib'];
-class TypeScriptVersionProvider {
+export const MODULE_FOLDERS = ['node_modules/typescript/lib', '.vscode/pnpify/typescript/lib', '.yarn/sdks/typescript/lib'];
+export class TypeScriptVersionProvider {
     constructor(configuration, logger) {
         this.configuration = configuration;
         this.logger = logger;
     }
     getUserSettingVersion() {
-        var _a, _b, _c, _d, _e, _f;
         const { tsserverPath } = this.configuration || {};
         if (!tsserverPath) {
             return null;
         }
-        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.info(`Resolving user-provided tsserver path "${tsserverPath}"...`);
+        this.logger?.info(`Resolving user-provided tsserver path "${tsserverPath}"...`);
         let resolvedPath = tsserverPath;
         // Resolve full path to the binary if path is not absolute.
-        if (!path_1.default.isAbsolute(resolvedPath)) {
-            const binaryPath = which_1.default.sync(tsserverPath, { nothrow: true });
+        if (!path.isAbsolute(resolvedPath)) {
+            const binaryPath = which.sync(tsserverPath, { nothrow: true });
             if (binaryPath) {
                 resolvedPath = binaryPath;
             }
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.info(`Non-absolute tsserver path resolved to "${binaryPath ? resolvedPath : '<failed>'}"`);
+            this.logger?.info(`Non-absolute tsserver path resolved to "${binaryPath ? resolvedPath : '<failed>'}"`);
         }
         // Resolve symbolic link.
-        let stat = fs_1.default.lstatSync(resolvedPath, { throwIfNoEntry: false });
-        if (stat === null || stat === void 0 ? void 0 : stat.isSymbolicLink()) {
-            resolvedPath = fs_1.default.realpathSync(resolvedPath);
-            (_c = this.logger) === null || _c === void 0 ? void 0 : _c.info(`Symbolic link tsserver path resolved to "${resolvedPath}"`);
+        let stat = fs.lstatSync(resolvedPath, { throwIfNoEntry: false });
+        if (stat?.isSymbolicLink()) {
+            resolvedPath = fs.realpathSync(resolvedPath);
+            this.logger?.info(`Symbolic link tsserver path resolved to "${resolvedPath}"`);
         }
         // Get directory path
-        stat = fs_1.default.lstatSync(resolvedPath, { throwIfNoEntry: false });
-        if (stat === null || stat === void 0 ? void 0 : stat.isFile()) {
-            resolvedPath = path_1.default.dirname(resolvedPath);
-            (_d = this.logger) === null || _d === void 0 ? void 0 : _d.info(`Resolved directory path from a file path: ${resolvedPath}`);
+        stat = fs.lstatSync(resolvedPath, { throwIfNoEntry: false });
+        if (stat?.isFile()) {
+            resolvedPath = path.dirname(resolvedPath);
+            this.logger?.info(`Resolved directory path from a file path: ${resolvedPath}`);
         }
         // Resolve path to the "lib" dir.
         try {
-            const packageJsonPath = pkg_up_1.default.sync({ cwd: resolvedPath });
-            (_e = this.logger) === null || _e === void 0 ? void 0 : _e.info(`Resolved package.json location: "${packageJsonPath}"`);
+            const packageJsonPath = pkgUpSync({ cwd: resolvedPath });
+            this.logger?.info(`Resolved package.json location: "${packageJsonPath}"`);
             if (packageJsonPath) {
-                resolvedPath = path_1.default.join(path_1.default.dirname(packageJsonPath), 'lib');
-                (_f = this.logger) === null || _f === void 0 ? void 0 : _f.info(`Assumed tsserver lib location: "${resolvedPath}"`);
+                resolvedPath = path.join(path.dirname(packageJsonPath), 'lib');
+                this.logger?.info(`Assumed tsserver lib location: "${resolvedPath}"`);
             }
         }
-        catch (_g) {
+        catch {
             // ignore
         }
-        return new TypeScriptVersion("user-setting" /* UserSetting */, resolvedPath, undefined, this.logger);
+        return new TypeScriptVersion("user-setting" /* TypeScriptVersionSource.UserSetting */, resolvedPath, undefined, this.logger);
     }
     getWorkspaceVersion(workspaceFolders) {
         for (const p of workspaceFolders) {
-            const libFolder = (0, modules_resolver_1.findPathToModule)(p, exports.MODULE_FOLDERS);
+            const libFolder = findPathToModule(p, MODULE_FOLDERS);
             if (libFolder) {
-                const version = new TypeScriptVersion("workspace" /* Workspace */, libFolder);
+                const version = new TypeScriptVersion("workspace" /* TypeScriptVersionSource.Workspace */, libFolder);
                 if (version.isValid) {
                     return version;
                 }
@@ -150,9 +142,10 @@ class TypeScriptVersionProvider {
         return null;
     }
     bundledVersion() {
+        const require = createRequire(import.meta.url);
         try {
             const file = require.resolve('typescript');
-            const bundledVersion = new TypeScriptVersion("bundled" /* Bundled */, path_1.default.dirname(file), '');
+            const bundledVersion = new TypeScriptVersion("bundled" /* TypeScriptVersionSource.Bundled */, path.dirname(file), '');
             return bundledVersion;
         }
         catch (e) {
@@ -161,5 +154,4 @@ class TypeScriptVersionProvider {
         }
     }
 }
-exports.TypeScriptVersionProvider = TypeScriptVersionProvider;
 //# sourceMappingURL=versionProvider.js.map

package/lib/utils/versionProvider.js.map

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

package/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAOA,qBAAa,QAAQ,CAAC,CAAC;IACnB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAEhC,OAAO,aAGJ;CACN"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAOA,qBAAa,QAAQ,CAAC,CAAC;IACnB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAa;IACxC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,IAAI,CAAc;IAE7C,OAAO,aAGJ;CACN"}

package/lib/utils.js

@@ -1,19 +1,17 @@
-"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
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deferred = void 0;
-class Deferred {
+export class Deferred {
     constructor() {
+        this.resolve = (_) => { };
+        this.reject = (_) => { };
         this.promise = new Promise((resolve, reject) => {
             this.resolve = resolve;
             this.reject = reject;
         });
     }
 }
-exports.Deferred = Deferred;
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,MAAa,QAAQ;IAArB;QAII,YAAO,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AARD,4BAQC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,OAAO,QAAQ;IAArB;QACI,YAAO,GAAuB,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC,CAAC;QACxC,WAAM,GAA4B,CAAC,CAAE,EAAE,EAAE,GAAE,CAAC,CAAC;QAE7C,YAAO,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC;CAAA"}

package/package.json

@@ -1,19 +1,17 @@
 {
   "name": "typescript-language-server",
-  "version": "0.11.2",
+  "version": "1.1.1",
   "description": "Language Server Protocol (LSP) implementation for TypeScript using tsserver",
   "author": "TypeFox and others",
   "license": "Apache-2.0",
-  "engines": {
-    "node": ">=12"
-  },
-  "eslintIgnore": [
-    "!.eslintrc.js"
-  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/typescript-language-server/typescript-language-server.git"
   },
+  "type": "module",
+  "engines": {
+    "node": ">=14.16"
+  },
   "files": [
     "lib"
   ],
@@ -22,16 +20,20 @@
   },
   "scripts": {
     "clean": "rimraf lib *.tsbuildinfo",
-    "test": "cross-env TS_NODE_PROJECT=./tsconfig.json mocha --exit --watch-files \"./src/**/*.ts\" --reporter spec \"./src/**/*.spec.ts\" --require source-map-support/register --require ts-node/register",
-    "test:watch": "cross-env TS_NODE_PROJECT=./tsconfig.json mocha --exit --watch-files \"./src/**/*.ts\" --reporter spec \"./src/**/*.spec.ts\" --require source-map-support/register --require ts-node/register --watch",
-    "test:compiled": "mocha --exit --reporter spec \"./lib/**/*.spec.js\"",
+    "test": "cross-env CONSOLE_LOG_LEVEL=warn TS_NODE_PROJECT=./tsconfig.json mocha",
+    "test:watch": "cross-env CONSOLE_LOG_LEVEL=warn TS_NODE_PROJECT=./tsconfig.json mocha --watch",
+    "test:compiled": "cross-env CONSOLE_LOG_LEVEL=warn mocha \"./lib/**/*.spec.js\"",
     "lint": "eslint --ext \".js,.ts\" src",
+    "fix": "eslint --ext \".js,.ts\" --fix src",
     "build": "concurrently -n compile,lint -c blue,green \"yarn compile\" \"yarn lint\"",
     "compile": "tsc -b",
     "watch": "tsc -b --watch --verbose",
     "postversion": "git push --follow-tags",
     "prepare": "cd test-data/jsx && yarn"
   },
+  "eslintIgnore": [
+    "!.eslintrc.cjs"
+  ],
   "husky": {
     "hooks": {
       "pre-commit": "yarn lint && yarn build && yarn test:compiled",
@@ -39,35 +41,38 @@
     }
   },
   "dependencies": {
-    "commander": "^9.0.0",
-    "fs-extra": "^10.0.0",
-    "p-debounce": "^2.1.0",
-    "pkg-up": "^3.1.0",
-    "semver": "^7.3.5",
-    "tempy": "^1.0.1",
-    "vscode-languageserver": "^7.0.0",
-    "vscode-languageserver-protocol": "3.16.0",
+    "commander": "^9.4.0",
+    "deepmerge": "^4.2.2",
+    "fs-extra": "^10.1.0",
+    "p-debounce": "^4.0.0",
+    "pkg-up": "^4.0.0",
+    "semver": "^7.3.7",
+    "tempy": "^3.0.0",
+    "vscode-languageserver": "^8.0.2",
+    "vscode-languageserver-protocol": "^3.17.2",
     "vscode-languageserver-textdocument": "1.0.5",
-    "vscode-uri": "^3.0.2",
+    "vscode-uri": "^3.0.3",
     "which": "^2.0.2"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.19",
-    "@types/fs-extra": "^9.0.11",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.11.6",
+    "@types/chai": "^4.3.3",
+    "@types/deepmerge": "^2.2.0",
+    "@types/fs-extra": "^9.0.13",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^16.11.52",
+    "@types/semver": "^7.3.12",
     "@types/which": "^2.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.3.1",
-    "@typescript-eslint/parser": "^5.3.1",
-    "chai": "^4.3.4",
-    "concurrently": "^7.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.33.1",
+    "@typescript-eslint/parser": "^5.33.1",
+    "chai": "^4.3.6",
+    "concurrently": "^7.3.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.2.0",
-    "husky": "4.x.x",
-    "mocha": "^9.0.1",
+    "eslint": "^8.22.0",
+    "husky": "4.x",
+    "mocha": "^10.0.0",
     "rimraf": "^3.0.2",
-    "source-map-support": "^0.5.19",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.4.3"
+    "source-map-support": "^0.5.21",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.7.4"
   }
 }