@rsvelte/language-server 0.2.2 → 0.4.0

package/README.md

@@ -18,7 +18,8 @@ toolchain.
 - **Diagnostics** — push diagnostics from the bundled
   [`rsvelte_lint`](https://github.com/baseballyama/rsvelte/tree/main/crates/rsvelte_lint)
   engine (compiled to wasm, vendored in the package — no extra install). Runs on
-  open, on change (300 ms debounced), and on save.
+  open, on change (300 ms debounced), and on save. The rule set comes from the
+  project's own [`rsvelte-lint.json`](#lint-configuration).
 
 That's the full v1 surface — hover, completion, go-to-definition, rename,
 find-references, and TypeScript diagnostics are **not** implemented. Those
@@ -37,6 +38,38 @@ The server reads these from the client's `rsvelte.*` configuration:
 | `rsvelte.lint.enable` | `true` | Enable linting via the bundled engine. |
 | `rsvelte.rsvelteFmtPath` | `""` | Explicit path to a `rsvelte-fmt` binary (overrides resolution). |
 
+## Lint configuration
+
+Severities and rule options come from a `rsvelte-lint.json` (or
+`.rsvelte-lintrc.json`), discovered by walking up from the document's directory
+— the same file, in the same order, that the
+[`rsvelte-lint`](https://www.npmjs.com/package/@rsvelte/lint) CLI resolves, so
+the editor reports what CI does. With no config file, every rule runs at its
+default severity (the `recommended` preset); to start from nothing and opt in,
+use `"extends": ["none"]`:
+
+```json
+{
+  "extends": ["recommended"],
+  "rules": {
+    "svelte/no-at-html-tags": "error",
+    "svelte/no-unused-class-name": "off",
+    "svelte/button-has-type": ["warn", { "submit": true, "reset": false }]
+  }
+}
+```
+
+See the
+[CLI's configuration reference](https://www.npmjs.com/package/@rsvelte/lint#configuration)
+for the full shape. An ESLint config is deliberately **not** read: importing it
+is opt-in on the CLI (`--config-from-eslint`), and a server that read it on its
+own would report a different rule set than the same project's CI. A config that
+can't be read or parsed is reported to the client's log and the recommended
+preset is used, so a typo never leaves the editor without diagnostics.
+
+Resolved configs are cached for the life of the server; they are dropped when a
+config file is saved through the client, and on `workspace/didChangeConfiguration`.
+
 ## Usage
 
 ```sh
@@ -48,6 +81,18 @@ Most users won't run this directly — the
 bundles and launches it. For other editors, point your LSP client at the
 `rsvelte-language-server` binary with the `--stdio` transport.
 
+## Native server
+
+`rsvelte-language-server` is a launcher. It prefers the prebuilt native (Rust)
+server shipped in the optional `@rsvelte/language-server-<platform>` packages
+and falls back to the bundled JS server when no platform package is installed
+(unsupported platform, or an install that skipped optional dependencies).
+
+| Environment variable | Effect |
+| --- | --- |
+| `RSVELTE_LANGUAGE_SERVER_BIN` | Run this binary instead of the resolved one. |
+| `RSVELTE_LANGUAGE_SERVER_JS=1` | Force the bundled JS server. |
+
 ## License
 
 MIT

package/bin/rsvelte-language-server.mjs

@@ -0,0 +1,80 @@
+#!/usr/bin/env node
+// Launcher for `rsvelte-language-server`.
+//
+// It prefers the native Rust server shipped in the optional
+// `@rsvelte/language-server-<triple>` packages and falls back to the bundled
+// JS server (`dist/server.mjs`) when no platform package is installed — so an
+// unsupported platform, or an install that skipped optional dependencies,
+// keeps the capabilities it has today instead of failing outright.
+//
+// Like the @rsvelte/fmt and @rsvelte/lint launchers, this file is never
+// rewritten in place: pnpm bakes a shim interpreter from this file's shebang at
+// link time, so swapping it for a native binary post-install would make that
+// shim feed Mach-O/ELF bytes to Node.
+
+import { spawnSync } from 'node:child_process';
+import { constants as osConstants } from 'node:os';
+import { existsSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import {
+	ensureExecutable,
+	platformPackage,
+	resolvePlatformBinary,
+} from '../lib/resolve.mjs';
+
+const pkgRoot = dirname(dirname(fileURLToPath(import.meta.url)));
+const argv = process.argv.slice(2);
+
+// Escape hatches for editors and debugging: point at a locally built server, or
+// force the JS implementation when the native one misbehaves.
+const override = process.env.RSVELTE_LANGUAGE_SERVER_BIN;
+const forceJs = process.env.RSVELTE_LANGUAGE_SERVER_JS === '1';
+
+let command;
+let args;
+if (override) {
+	command = override;
+	args = argv;
+} else {
+	const native = forceJs ? null : resolvePlatformBinary();
+	if (native) {
+		ensureExecutable(native);
+		command = native;
+		args = argv;
+	} else {
+		const jsServer = join(pkgRoot, 'dist', 'server.mjs');
+		if (!existsSync(jsServer)) {
+			const { triple, pkgName } = platformPackage();
+			const why = forceJs
+				? 'RSVELTE_LANGUAGE_SERVER_JS=1 forced it.'
+				: triple
+					? `the native package "${pkgName}" isn't installed.\nTry reinstalling: npm install --include=optional ${pkgName}`
+					: `platform ${process.platform}-${process.arch} has no prebuilt binary.`;
+			console.error(
+				`[@rsvelte/language-server] No server to run: the JS fallback (${jsServer}) is missing and ${why}`,
+			);
+			process.exit(1);
+		}
+		command = process.execPath;
+		args = [jsServer, ...argv];
+	}
+}
+
+const result = spawnSync(command, args, { stdio: 'inherit', windowsHide: true });
+
+if (result.error) {
+	console.error(
+		`[@rsvelte/language-server] Failed to exec ${command}: ${result.error.message}`,
+	);
+	process.exit(1);
+}
+
+// A signal termination leaves `status` null; returning `status ?? 0` would mask
+// the crash as a clean exit.
+if (result.signal) {
+	const signum = osConstants.signals[result.signal];
+	console.error(`[@rsvelte/language-server] ${command} was terminated by ${result.signal}.`);
+	process.exit(typeof signum === 'number' ? 128 + signum : 1);
+}
+process.exit(result.status ?? 0);

package/dist/server.mjs

@@ -10114,7 +10114,7 @@ function getWellformedEdit(textEdit) {
 
 // src/server.ts
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import { dirname as dirname3 } from "node:path";
+import { dirname as dirname4 } from "node:path";
 
 // src/diagnostics.ts
 var import_node = __toESM(require_main3(), 1);
@@ -10233,11 +10233,11 @@ function load() {
     return null;
   }
 }
-function runLint(source, filename) {
+function runLint(source, filename, config) {
   const m = load();
   if (!m) return null;
   try {
-    return m.lint(source, filename);
+    return m.lint_with_config(source, filename, config);
   } catch {
     return null;
   }
@@ -10252,6 +10252,62 @@ function lintVersion() {
   }
 }
 
+// src/lintConfig.ts
+import { basename, dirname as dirname3, join as join3 } from "node:path";
+import { readFileSync } from "node:fs";
+var CONFIG_NAMES = ["rsvelte-lint.json", ".rsvelte-lintrc.json"];
+var NO_CONFIG = { text: "", path: null };
+var cache = /* @__PURE__ */ new Map();
+function isLintConfigPath(path) {
+  return CONFIG_NAMES.includes(basename(path));
+}
+function clearLintConfigCache() {
+  cache.clear();
+}
+function resolveLintConfig(dir, onError) {
+  const cached = cache.get(dir);
+  if (cached) return cached;
+  const found = discover(dir);
+  cache.set(dir, found.config);
+  if (found.error) onError?.(`${found.config.path}: ${found.error}`);
+  return found.config;
+}
+function discover(start) {
+  let dir = start;
+  for (; ; ) {
+    for (const name of CONFIG_NAMES) {
+      const found = read(join3(dir, name));
+      if (found) return found;
+    }
+    const parent = dirname3(dir);
+    if (parent === dir) return { config: NO_CONFIG, error: null };
+    dir = parent;
+  }
+}
+function read(path) {
+  let text;
+  try {
+    text = readFileSync(path, "utf8");
+  } catch (err) {
+    const code = err.code;
+    if (code === "ENOENT" || code === "ENOTDIR") return null;
+    return { config: { text: "", path }, error: String(err) };
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch (err) {
+    return { config: { text: "", path }, error: String(err) };
+  }
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    return {
+      config: { text: "", path },
+      error: "lint config must be a JSON object"
+    };
+  }
+  return { config: { text, path }, error: null };
+}
+
 // src/server.ts
 var DEFAULT_SETTINGS = {
   format: { enable: true },
@@ -10313,9 +10369,8 @@ async function refreshSettings() {
 }
 connection.onDidChangeConfiguration(async () => {
   await refreshSettings();
-  for (const doc of documents.all()) {
-    scheduleLint(doc, 0);
-  }
+  clearLintConfigCache();
+  relintOpenDocuments();
 });
 connection.onDocumentFormatting(async (params) => {
   if (!settings.format.enable) return [];
@@ -10323,7 +10378,7 @@ connection.onDocumentFormatting(async (params) => {
   if (!doc) return [];
   const fsPath = docFsPath(doc.uri);
   const binPath = resolveRsvelteFmt(
-    dirname3(fsPath),
+    dirname4(fsPath),
     settings.rsvelteFmtPath
   );
   if (!binPath) return [];
@@ -10350,13 +10405,30 @@ async function lintDocument(doc) {
     connection.sendDiagnostics({ uri: doc.uri, diagnostics: [] });
     return;
   }
-  const json = runLint(doc.getText(), docFsPath(doc.uri));
+  const fsPath = docFsPath(doc.uri);
+  const config = resolveLintConfig(
+    dirname4(fsPath),
+    (message) => connection.console.warn(message)
+  );
+  const json = runLint(doc.getText(), fsPath, config.text);
   const diagnostics = json ? lintJsonToDiagnostics(json) : [];
   connection.sendDiagnostics({ uri: doc.uri, diagnostics });
 }
+function relintOpenDocuments() {
+  for (const doc of documents.all()) {
+    scheduleLint(doc, 0);
+  }
+}
 documents.onDidOpen((e) => scheduleLint(e.document, 0));
 documents.onDidChangeContent((e) => scheduleLint(e.document));
-documents.onDidSave((e) => scheduleLint(e.document, 0));
+documents.onDidSave((e) => {
+  if (isLintConfigPath(docFsPath(e.document.uri))) {
+    clearLintConfigCache();
+    relintOpenDocuments();
+    return;
+  }
+  scheduleLint(e.document, 0);
+});
 documents.onDidClose((e) => {
   const timer = debounceTimers.get(e.document.uri);
   if (timer) {

package/dist/vendor/rsvelte_lint.cjs

@@ -269,6 +269,35 @@ function lint_version() {
 }
 exports.lint_version = lint_version;
 
+/**
+ * [`lint`] under the text of a `rsvelte-lint.json`. Wasm has no filesystem, so
+ * the host (the language server) discovers the config file and passes its
+ * contents in; `""` selects the recommended preset.
+ * @param {string} source
+ * @param {string} filename
+ * @param {string} config
+ * @returns {string}
+ */
+function lint_with_config(source, filename, config) {
+    let deferred4_0;
+    let deferred4_1;
+    try {
+        const ptr0 = passStringToWasm0(source, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(filename, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ptr2 = passStringToWasm0(config, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len2 = WASM_VECTOR_LEN;
+        const ret = wasm.lint_with_config(ptr0, len0, ptr1, len1, ptr2, len2);
+        deferred4_0 = ret[0];
+        deferred4_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred4_0, deferred4_1, 1);
+    }
+}
+exports.lint_with_config = lint_with_config;
+
 /**
  * Parse a Svelte component and return the AST as JSON.
  * @param {string} source
@@ -403,8 +432,8 @@ function __wbg_get_imports() {
             getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
         },
         __wbindgen_cast_0000000000000001: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [String], shim_idx: 164, ret: String, inner_ret: Some(String) }, mutable: false }) -> Externref`.
-            const ret = makeClosure(arg0, arg1, wasm_bindgen_b67232e9c19c9ca6___convert__closures_____invoke___alloc_a941a2cfab7efbc4___string__String__alloc_a941a2cfab7efbc4___string__String__true_);
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [String], shim_idx: 5, ret: String, inner_ret: Some(String) }, mutable: false }) -> Externref`.
+            const ret = makeClosure(arg0, arg1, wasm_bindgen_de7100a3341595c3___convert__closures_____invoke___alloc_a941a2cfab7efbc4___string__String__alloc_a941a2cfab7efbc4___string__String__true_);
             return ret;
         },
         __wbindgen_cast_0000000000000002: function(arg0, arg1) {
@@ -428,13 +457,13 @@ function __wbg_get_imports() {
     };
 }
 
-function wasm_bindgen_b67232e9c19c9ca6___convert__closures_____invoke___alloc_a941a2cfab7efbc4___string__String__alloc_a941a2cfab7efbc4___string__String__true_(arg0, arg1, arg2) {
+function wasm_bindgen_de7100a3341595c3___convert__closures_____invoke___alloc_a941a2cfab7efbc4___string__String__alloc_a941a2cfab7efbc4___string__String__true_(arg0, arg1, arg2) {
     let deferred2_0;
     let deferred2_1;
     try {
         const ptr0 = passStringToWasm0(arg2, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.wasm_bindgen_b67232e9c19c9ca6___convert__closures_____invoke___alloc_a941a2cfab7efbc4___string__String__alloc_a941a2cfab7efbc4___string__String__true_(arg0, arg1, ptr0, len0);
+        const ret = wasm.wasm_bindgen_de7100a3341595c3___convert__closures_____invoke___alloc_a941a2cfab7efbc4___string__String__alloc_a941a2cfab7efbc4___string__String__true_(arg0, arg1, ptr0, len0);
         deferred2_0 = ret[0];
         deferred2_1 = ret[1];
         return getStringFromWasm0(ret[0], ret[1]);

package/lib/resolve.mjs

@@ -0,0 +1,74 @@
+// Resolution helpers for the @rsvelte/language-server launcher: they find the
+// platform-native `rsvelte-language-server` binary shipped in the optional
+// `@rsvelte/language-server-<triple>` packages.
+//
+// ESM (not `.cjs` like the @rsvelte/fmt / @rsvelte/lint siblings) because this
+// package is `"type": "module"`; the resolution logic itself is identical.
+
+import { chmodSync, constants, statSync } from 'node:fs';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+
+/// Map the current platform/arch to a `@rsvelte/language-server-<triple>`
+/// suffix, or `null` when unsupported. Mirrors the release build matrix.
+export function resolveTriple() {
+	const { platform, arch } = process;
+	if (platform === 'darwin') {
+		if (arch === 'arm64') return 'darwin-arm64';
+		if (arch === 'x64') return 'darwin-x64';
+	} else if (platform === 'linux') {
+		// Node 18+ exposes the runtime glibc version; an empty value means musl.
+		let isMusl = false;
+		try {
+			const header = process.report.getReport().header;
+			isMusl = !header.glibcVersionRuntime;
+		} catch {
+			isMusl = false;
+		}
+		const libc = isMusl ? 'musl' : 'gnu';
+		if (arch === 'x64') return `linux-x64-${libc}`;
+		if (arch === 'arm64') return `linux-arm64-${libc}`;
+	} else if (platform === 'win32') {
+		if (arch === 'x64') return 'win32-x64-msvc';
+	}
+	return null;
+}
+
+/// The platform package name + binary basename for the current platform.
+/// `triple` is `null` when the platform is unsupported.
+export function platformPackage() {
+	const triple = resolveTriple();
+	if (!triple) return { triple: null, pkgName: null, binName: null };
+	const pkgName = `@rsvelte/language-server-${triple}`;
+	const binName =
+		process.platform === 'win32'
+			? 'rsvelte-language-server.exe'
+			: 'rsvelte-language-server';
+	return { triple, pkgName, binName };
+}
+
+/// Resolve the absolute path to the prebuilt native server for this platform,
+/// or `null` when the optional platform package isn't installed.
+export function resolvePlatformBinary() {
+	const { pkgName, binName } = platformPackage();
+	if (!pkgName) return null;
+	try {
+		return require.resolve(`${pkgName}/${binName}`);
+	} catch {
+		return null;
+	}
+}
+
+/// Best-effort `chmod +x` on a POSIX file. No-op on Windows / read-only FS.
+export function ensureExecutable(binPath) {
+	if (process.platform === 'win32') return;
+	try {
+		const mode = statSync(binPath).mode;
+		if (!(mode & constants.S_IXUSR)) {
+			chmodSync(binPath, (mode & 0o777) | 0o111);
+		}
+	} catch {
+		// Not fatal — a later spawn surfaces a clear error if it really can't run.
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsvelte/language-server",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "description": "Language Server for rsvelte — formatting (native rsvelte-fmt) and linting (bundled rsvelte_lint wasm)",
   "license": "MIT",
   "repository": {
@@ -22,13 +22,22 @@
   ],
   "type": "module",
   "bin": {
-    "rsvelte-language-server": "dist/server.mjs"
+    "rsvelte-language-server": "bin/rsvelte-language-server.mjs"
   },
   "files": [
+    "bin/rsvelte-language-server.mjs",
+    "lib/resolve.mjs",
     "dist/server.mjs",
     "dist/vendor/rsvelte_lint.cjs",
     "dist/vendor/rsvelte_lint_bg.wasm"
   ],
+  "optionalDependencies": {
+    "@rsvelte/language-server-darwin-arm64": "^0.4.0",
+    "@rsvelte/language-server-darwin-x64": "^0.4.0",
+    "@rsvelte/language-server-linux-arm64-gnu": "^0.4.0",
+    "@rsvelte/language-server-linux-x64-gnu": "^0.4.0",
+    "@rsvelte/language-server-win32-x64-msvc": "^0.4.0"
+  },
   "dependencies": {
     "vscode-languageserver": "^10.0.0",
     "vscode-languageserver-textdocument": "^1.0.12"