typescript-language-server 0.7.1 → 0.9.1

package/lib/utils/types.d.ts

@@ -0,0 +1,41 @@
+export declare class CodeActionKind {
+    readonly value: string;
+    private static readonly sep;
+    static readonly Empty: CodeActionKind;
+    static readonly QuickFix: CodeActionKind;
+    static readonly Refactor: CodeActionKind;
+    static readonly Source: CodeActionKind;
+    static readonly SourceAddMissingImportsTs: CodeActionKind;
+    static readonly SourceRemoveUnusedTs: CodeActionKind;
+    static readonly SourceOrganizeImports: CodeActionKind;
+    static readonly SourceOrganizeImportsTs: CodeActionKind;
+    static readonly SourceFixAll: CodeActionKind;
+    static readonly SourceFixAllTs: CodeActionKind;
+    constructor(value: string);
+    equals(other: CodeActionKind): boolean;
+    /**
+     * Checks if `other` is a sub-kind of this `CodeActionKind`.
+     *
+     * The kind `"refactor.extract"` for example contains `"refactor.extract"` and ``"refactor.extract.function"`,
+     * but not `"unicorn.refactor.extract"`, or `"refactor.extractAll"` or `refactor`.
+     *
+     * @param other Kind to check.
+     */
+    contains(other: CodeActionKind): boolean;
+    /**
+     * Checks if this code action kind intersects `other`.
+     *
+     * The kind `"refactor.extract"` for example intersects `refactor`, `"refactor.extract"` and ``"refactor.extract.function"`,
+     * but not `"unicorn.refactor.extract"`, or `"refactor.extractAll"`.
+     *
+     * @param other Kind to check.
+     */
+    intersects(other: CodeActionKind): boolean;
+    /**
+     * Create a new kind by appending a more specific selector to the current kind.
+     *
+     * Does not modify the current kind.
+     */
+    append(part: string): CodeActionKind;
+}
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAOA,qBAAa,cAAc;aAeH,KAAK,EAAE,MAAM;IAdjC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAO;IAElC,gBAAuB,KAAK,iBAAgD;IAC5E,gBAAuB,QAAQ,iBAAmD;IAClF,gBAAuB,QAAQ,iBAAmD;IAClF,gBAAuB,MAAM,iBAAiD;IAC9E,gBAAuB,yBAAyB,iBAA0E;IAC1H,gBAAuB,oBAAoB,iBAA6D;IACxG,gBAAuB,qBAAqB,iBAAgE;IAC5G,gBAAuB,uBAAuB,iBAAqD;IACnG,gBAAuB,YAAY,iBAAuD;IAC1F,gBAAuB,cAAc,iBAA4C;gBAG7D,KAAK,EAAE,MAAM;IAG1B,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO;IAI7C;;;;;;;OAOG;IACI,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO;IAI/C;;;;;;;OAOG;IACI,UAAU,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO;IAIjD;;;;OAIG;IACI,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc;CAG9C"}

package/lib/utils/types.js

@@ -0,0 +1,78 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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.CodeActionKind = void 0;
+const lsp = __importStar(require("vscode-languageserver/node"));
+class CodeActionKind {
+    constructor(value) {
+        this.value = value;
+    }
+    equals(other) {
+        return this.value === other.value;
+    }
+    /**
+     * Checks if `other` is a sub-kind of this `CodeActionKind`.
+     *
+     * The kind `"refactor.extract"` for example contains `"refactor.extract"` and ``"refactor.extract.function"`,
+     * but not `"unicorn.refactor.extract"`, or `"refactor.extractAll"` or `refactor`.
+     *
+     * @param other Kind to check.
+     */
+    contains(other) {
+        return this.equals(other) || this.value === '' || other.value.startsWith(this.value + CodeActionKind.sep);
+    }
+    /**
+     * Checks if this code action kind intersects `other`.
+     *
+     * The kind `"refactor.extract"` for example intersects `refactor`, `"refactor.extract"` and ``"refactor.extract.function"`,
+     * but not `"unicorn.refactor.extract"`, or `"refactor.extractAll"`.
+     *
+     * @param other Kind to check.
+     */
+    intersects(other) {
+        return this.contains(other) || other.contains(this);
+    }
+    /**
+     * Create a new kind by appending a more specific selector to the current kind.
+     *
+     * Does not modify the current kind.
+     */
+    append(part) {
+        return new CodeActionKind(this.value + CodeActionKind.sep + part);
+    }
+}
+exports.CodeActionKind = CodeActionKind;
+CodeActionKind.sep = '.';
+CodeActionKind.Empty = new CodeActionKind(lsp.CodeActionKind.Empty);
+CodeActionKind.QuickFix = new CodeActionKind(lsp.CodeActionKind.QuickFix);
+CodeActionKind.Refactor = new CodeActionKind(lsp.CodeActionKind.Refactor);
+CodeActionKind.Source = new CodeActionKind(lsp.CodeActionKind.Source);
+CodeActionKind.SourceAddMissingImportsTs = CodeActionKind.Source.append('SourceAddMissingImportsTs').append('ts');
+CodeActionKind.SourceRemoveUnusedTs = CodeActionKind.Source.append('removeUnused').append('ts');
+CodeActionKind.SourceOrganizeImports = new CodeActionKind(lsp.CodeActionKind.SourceOrganizeImports);
+CodeActionKind.SourceOrganizeImportsTs = CodeActionKind.SourceOrganizeImports.append('ts');
+CodeActionKind.SourceFixAll = new CodeActionKind(lsp.CodeActionKind.SourceFixAll);
+CodeActionKind.SourceFixAllTs = CodeActionKind.SourceFixAll.append('ts');
+//# sourceMappingURL=types.js.map

package/lib/utils/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;;;;;;;;;;;;;;;;;;;AAEhG,gEAAkD;AAElD,MAAa,cAAc;IAcvB,YACoB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAC7B,CAAC;IAEE,MAAM,CAAC,KAAqB;QAC/B,OAAO,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC;IACtC,CAAC;IAED;;;;;;;OAOG;IACI,QAAQ,CAAC,KAAqB;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAC9G,CAAC;IAED;;;;;;;OAOG;IACI,UAAU,CAAC,KAAqB;QACnC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,IAAY;QACtB,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IACtE,CAAC;;AArDL,wCAsDC;AArD2B,kBAAG,GAAG,GAAG,CAAC;AAEX,oBAAK,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;AACrD,uBAAQ,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;AAC3D,uBAAQ,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;AAC3D,qBAAM,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;AACvD,wCAAyB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACnG,mCAAoB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACjF,oCAAqB,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;AACrF,sCAAuB,GAAG,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC5E,2BAAY,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;AACnE,6BAAc,GAAG,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC"}

package/lib/utils/versionProvider.d.ts

@@ -0,0 +1,30 @@
+import API from './api';
+import { IServerOptions } from './configuration';
+export declare const enum TypeScriptVersionSource {
+    Bundled = "bundled",
+    UserSetting = "user-setting",
+    Workspace = "workspace"
+}
+export declare class TypeScriptVersion {
+    readonly source: TypeScriptVersionSource;
+    readonly path: string;
+    private readonly _pathLabel?;
+    private _api;
+    constructor(source: TypeScriptVersionSource, path: string, _pathLabel?: string | undefined);
+    get tscPath(): string;
+    get tsServerPath(): string;
+    get pathLabel(): string;
+    get isValid(): boolean;
+    get version(): API | null;
+    get versionString(): string | null;
+    private getTypeScriptVersion;
+}
+export declare const MODULE_FOLDERS: string[];
+export declare class TypeScriptVersionProvider {
+    private configuration?;
+    constructor(configuration?: IServerOptions | undefined);
+    getUserSettingVersion(): TypeScriptVersion | null;
+    getWorkspaceVersion(workspaceFolders: string[]): TypeScriptVersion | null;
+    bundledVersion(): TypeScriptVersion | null;
+}
+//# sourceMappingURL=versionProvider.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"versionProvider.d.ts","sourceRoot":"","sources":["../../src/utils/versionProvider.ts"],"names":[],"mappings":"AAQA,OAAO,GAAG,MAAM,OAAO,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjD,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;IAJhC,OAAO,CAAC,IAAI,CAAyB;gBAEjB,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,MAAM,EACX,UAAU,CAAC,oBAAQ;IAKxC,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;CAkC/B;AAED,eAAO,MAAM,cAAc,UAAgG,CAAC;AAE5H,qBAAa,yBAAyB;IACf,OAAO,CAAC,aAAa,CAAC;gBAAd,aAAa,CAAC,4BAAgB;IAElD,qBAAqB,IAAI,iBAAiB,GAAG,IAAI;IAsCjD,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,iBAAiB,GAAG,IAAI;IAazE,cAAc,IAAI,iBAAiB,GAAG,IAAI;CAapD"}

package/lib/utils/versionProvider.js

@@ -0,0 +1,147 @@
+"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 {
+    constructor(source, path, _pathLabel) {
+        this.source = source;
+        this.path = path;
+        this._pathLabel = _pathLabel;
+        this._api = null;
+    }
+    get tscPath() {
+        return path_1.default.resolve(this.path, '../bin/tsc');
+    }
+    get tsServerPath() {
+        return path_1.default.resolve(this.path, 'tsserver.js');
+    }
+    get pathLabel() {
+        return typeof this._pathLabel === 'undefined' ? this.path : this._pathLabel;
+    }
+    get isValid() {
+        return this.version !== null;
+    }
+    get version() {
+        if (this._api) {
+            return this._api;
+        }
+        this._api = this.getTypeScriptVersion(this.tsServerPath);
+        return this._api;
+    }
+    get versionString() {
+        const version = this.version;
+        return version ? version.displayName : null;
+    }
+    getTypeScriptVersion(serverPath) {
+        if (!fs_1.default.existsSync(serverPath)) {
+            return null;
+        }
+        const p = serverPath.split(path_1.default.sep);
+        if (p.length <= 2) {
+            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)) {
+            // Special case for ts dev versions
+            if (path_1.default.basename(modulePath) === 'built') {
+                fileName = path_1.default.join(modulePath, '..', 'package.json');
+            }
+        }
+        if (!fs_1.default.existsSync(fileName)) {
+            return null;
+        }
+        const contents = fs_1.default.readFileSync(fileName).toString();
+        let desc = null;
+        try {
+            desc = JSON.parse(contents);
+        }
+        catch (err) {
+            return null;
+        }
+        if (!desc || !desc.version) {
+            return null;
+        }
+        return desc.version ? api_1.default.fromVersionString(desc.version) : null;
+    }
+}
+exports.TypeScriptVersion = TypeScriptVersion;
+exports.MODULE_FOLDERS = ['node_modules/typescript/lib', '.vscode/pnpify/typescript/lib', '.yarn/sdks/typescript/lib'];
+class TypeScriptVersionProvider {
+    constructor(configuration) {
+        this.configuration = configuration;
+    }
+    getUserSettingVersion() {
+        const { tsserverPath } = this.configuration || {};
+        if (!tsserverPath) {
+            return null;
+        }
+        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 (binaryPath) {
+                resolvedPath = binaryPath;
+            }
+        }
+        // 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);
+        }
+        // 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);
+        }
+        // Resolve path to the "lib" dir.
+        try {
+            const packageJsonPath = pkg_up_1.default.sync({ cwd: resolvedPath });
+            if (packageJsonPath) {
+                resolvedPath = path_1.default.join(path_1.default.dirname(packageJsonPath), 'lib');
+            }
+        }
+        catch (_a) {
+            // ignore
+        }
+        return new TypeScriptVersion("user-setting" /* UserSetting */, resolvedPath);
+    }
+    getWorkspaceVersion(workspaceFolders) {
+        for (const p of workspaceFolders) {
+            const libFolder = (0, modules_resolver_1.findPathToModule)(p, exports.MODULE_FOLDERS);
+            if (libFolder) {
+                const version = new TypeScriptVersion("workspace" /* Workspace */, libFolder);
+                if (version.isValid) {
+                    return version;
+                }
+            }
+        }
+        return null;
+    }
+    bundledVersion() {
+        try {
+            const file = require.resolve('typescript');
+            const bundledVersion = new TypeScriptVersion("bundled" /* Bundled */, path_1.default.dirname(file), '');
+            return bundledVersion;
+        }
+        catch (e) {
+            // window.showMessage('Bundled typescript module not found', 'error');
+            return null;
+        }
+    }
+}
+exports.TypeScriptVersionProvider = TypeScriptVersionProvider;
+//# sourceMappingURL=versionProvider.js.map

package/lib/utils/versionProvider.js.map

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

package/lib/utils.d.ts

@@ -3,5 +3,4 @@ export declare class Deferred<T> {
     reject: (err?: unknown) => void;
     promise: Promise<T>;
 }
-export declare function getTsserverExecutable(): string;
 //# sourceMappingURL=utils.d.ts.map

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;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C"}
+{"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"}

package/lib/utils.js

@@ -6,7 +6,7 @@
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTsserverExecutable = exports.Deferred = void 0;
+exports.Deferred = void 0;
 class Deferred {
     constructor() {
         this.promise = new Promise((resolve, reject) => {
@@ -16,11 +16,4 @@ class Deferred {
     }
 }
 exports.Deferred = Deferred;
-function getTsserverExecutable() {
-    return isWindows() ? 'tsserver.cmd' : 'tsserver';
-}
-exports.getTsserverExecutable = getTsserverExecutable;
-function isWindows() {
-    return /^win/.test(process.platform);
-}
 //# 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;AAED,SAAgB,qBAAqB;IACjC,OAAO,SAAS,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC;AACrD,CAAC;AAFD,sDAEC;AAED,SAAS,SAAS;IACd,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AACzC,CAAC"}
+{"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"}

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "typescript-language-server",
-  "version": "0.7.1",
+  "version": "0.9.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"
   ],
@@ -17,40 +20,54 @@
   "bin": {
     "typescript-language-server": "./lib/cli.js"
   },
+  "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\"",
+    "lint": "eslint --ext \".js,.ts\" 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"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "yarn lint && yarn build && yarn test:compiled",
+      "post-merge": "yarn"
+    }
+  },
   "dependencies": {
-    "command-exists": "^1.2.6",
-    "commander": "^7.2.0",
+    "commander": "^8.3.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",
     "vscode-languageserver-textdocument": "^1.0.1",
-    "vscode-uri": "^1.0.5"
-  },
-  "scripts": {
-    "clean": "rimraf lib *.tsbuildinfo",
-    "test": "mocha --exit --reporter spec \"./lib/**/*.spec.js\"",
-    "lint": "eslint --ext \".js,.ts\" src",
-    "build": "concurrently -n compile,lint -c blue,green \"yarn compile\" \"yarn lint\"",
-    "compile": "tsc -b",
-    "watch": "tsc -b --watch --verbose"
+    "vscode-uri": "^3.0.2",
+    "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",
-    "@typescript-eslint/eslint-plugin": "^4.28.0",
-    "@typescript-eslint/parser": "^4.28.0",
+    "@types/which": "^2.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.3.1",
+    "@typescript-eslint/parser": "^5.3.1",
     "chai": "^4.3.4",
-    "concurrently": "^6.2.0",
-    "eslint": "^7.29.0",
+    "concurrently": "^7.0.0",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.2.0",
+    "husky": "4.x.x",
     "mocha": "^9.0.1",
     "rimraf": "^3.0.2",
     "source-map-support": "^0.5.19",
-    "ts-node": "7.0.1",
+    "ts-node": "^10.4.0",
     "typescript": "^4.4.3"
   }
 }

package/lib/modules-resolver.d.ts

@@ -1,3 +0,0 @@
-export declare function findPathToModule(dir: string, moduleName: string): string | undefined;
-export declare function findPathToYarnSdk(dir: string, moduleName: string): string | undefined;
-//# sourceMappingURL=modules-resolver.d.ts.map

package/lib/modules-resolver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"modules-resolver.d.ts","sourceRoot":"","sources":["../src/modules-resolver.ts"],"names":[],"mappings":"AASA,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAC,SAAS,CAMlF;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAYrF"}

package/lib/modules-resolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"modules-resolver.js","sourceRoot":"","sources":["../src/modules-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,uCAAyB;AACzB,2CAA6B;AAE7B,SAAgB,gBAAgB,CAAC,GAAW,EAAE,UAAkB;IAC5D,IAAI;QACA,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KACxD;IAAC,WAAM;QACJ,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAND,4CAMC;AAED,SAAgB,iBAAiB,CAAC,GAAW,EAAE,UAAkB;IAC7D,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QACjE,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC1B,OAAO,SAAS,CAAC;SACpB;KACJ;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACvC,IAAI,MAAM,KAAK,GAAG,EAAE;QAChB,OAAO,iBAAiB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;KAChD;AACL,CAAC;AAZD,8CAYC"}

package/lib/modules-resolver.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"modules-resolver.spec.d.ts","sourceRoot":"","sources":["../src/modules-resolver.spec.ts"],"names":[],"mappings":""}

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

@@ -1 +0,0 @@
-{"version":3,"file":"modules-resolver.spec.js","sourceRoot":"","sources":["../src/modules-resolver.spec.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;AAEH,2CAA6B;AAC7B,2CAA6B;AAC7B,yDAAsD;AAEtD,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACnC,MAAM,YAAY,GAAG,IAAA,mCAAgB,EAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;QAC5E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yCAAyC,CAAC,EAAE,YAAY,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}