@knip/language-server 2.0.3 → 3.0.0

package/README.md

@@ -84,7 +84,7 @@ Example:
 
 ### Imports
 
-The file desciptor can be used to display an overview of imports of a document
+The file descriptor can be used to display an overview of imports of a document
 with direct links to their definition location.
 
 Optionally, the client can implement:
@@ -99,7 +99,7 @@ Example:
 
 ### Exports
 
-The file desciptor can be used to display an overview of exports of a document
+The file descriptor can be used to display an overview of exports of a document
 with direct links to their usage locations.
 
 Optionally, the client can implement:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knip/language-server",
-  "version": "2.0.3",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/webpro-nl/knip.git",
@@ -20,10 +20,10 @@
   "dependencies": {
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.12",
-    "knip": "^5.87.0"
+    "knip": "^6.0.0"
   },
   "engines": {
-    "node": ">=18.20.0"
+    "node": "^20.19.0 || >=22.12.0"
   },
   "scripts": {
     "release": "release-it -c ../../.release-it.json"

package/src/server.js

@@ -1,3 +1,5 @@
+import { readFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { createOptions, createSession, KNIP_CONFIG_LOCATIONS } from 'knip/session';
@@ -26,6 +28,17 @@ import { issueToDiagnostic } from './diagnostics.js';
 
 const RESTART_FOR = new Set(['package.json', ...KNIP_CONFIG_LOCATIONS]);
 
+/** @param {string} resolvedPath */
+function readKnipVersion(resolvedPath) {
+  for (let dir = path.dirname(resolvedPath); dir !== path.dirname(dir); dir = path.dirname(dir)) {
+    try {
+      const pkg = JSON.parse(readFileSync(path.join(dir, 'package.json'), 'utf8'));
+      if (pkg.name === 'knip') return ` v${pkg.version}`;
+    } catch {}
+  }
+  return '';
+}
+
 /** @type {Config} */
 const DEFAULT_CONFIG = {
   deferSession: false,
@@ -67,8 +80,8 @@ const FILE_CHANGE_TYPES = new Map([
 ]);
 
 const ISSUE_DESC = {
-  classMembers: 'class member',
   enumMembers: 'enum member',
+  namespaceMembers: 'namespace member',
   types: 'export keyword',
   exports: 'export keyword',
 };
@@ -213,11 +226,28 @@ export class LanguageServer {
     this.published = new Set(newDiags.keys());
   }
 
+  async #resolveKnipSession() {
+    if (this.cwd) {
+      try {
+        const localRequire = createRequire(path.join(this.cwd, 'package.json'));
+        const resolved = localRequire.resolve('knip/session');
+        const local = await import(pathToFileURL(resolved).href);
+        this.connection.console.log(`Using local knip${readKnipVersion(resolved)}`);
+        return local;
+      } catch {}
+    }
+    this.connection.console.log(
+      `Using bundled knip${readKnipVersion(createRequire(__filename).resolve('knip/session'))}`
+    );
+    return { createOptions, createSession };
+  }
+
   async start() {
     if (this.session) return;
 
     try {
       const config = await this.getConfig();
+      const knip = await this.#resolveKnipSession();
 
       const configFilePath = config?.configFilePath
         ? path.isAbsolute(config.configFilePath)
@@ -226,12 +256,12 @@ export class LanguageServer {
         : undefined;
 
       this.connection.console.log('Creating options');
-      const options = await createOptions({ cwd: this.cwd, isSession: true, args: { config: configFilePath } });
+      const options = await knip.createOptions({ cwd: this.cwd, isSession: true, args: { config: configFilePath } });
       this.rules = options.rules;
 
       this.connection.console.log('Building module graph...');
       const start = Date.now();
-      const session = await createSession(options);
+      const session = await knip.createSession(options);
       this.connection.console.log(`Finished building module graph (${Date.now() - start}ms)`);
 
       this.session = session;
@@ -372,8 +402,8 @@ export class LanguageServer {
       if (
         issueType === 'exports' ||
         issueType === 'types' ||
-        issueType === 'classMembers' ||
-        issueType === 'enumMembers'
+        issueType === 'enumMembers' ||
+        issueType === 'namespaceMembers'
       ) {
         const removeExportEdit = createRemoveExportEdit(document, uri, issue);
         if (!removeExportEdit) continue;