@rsvelte/language-server 0.2.1 → 0.3.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

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

@@ -131,6 +131,41 @@ class ParseResultWasm {
 if (Symbol.dispose) ParseResultWasm.prototype[Symbol.dispose] = ParseResultWasm.prototype.free;
 exports.ParseResultWasm = ParseResultWasm;
 
+/**
+ * Compile a Svelte component with the full compile-options object.
+ *
+ * Supports the function-form compile options (issue #1680): the `parametric`
+ * function forms of `customElement`/`css`/`runes`, a `warningFilter` callback,
+ * a constant `cssHashOverride`, and a dynamic `cssHash` callback. Returns the
+ * compile result as a JSON string (`{ js, css, warnings, metadata }`);
+ * callbacks are input-only. Throws on a parse failure, an invalid option, or a
+ * `cssHash` callback that throws.
+ * @param {string} source
+ * @param {any} options
+ * @returns {string}
+ */
+function compile(source, options) {
+    let deferred3_0;
+    let deferred3_1;
+    try {
+        const ptr0 = passStringToWasm0(source, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.compile(ptr0, len0, options);
+        var ptr2 = ret[0];
+        var len2 = ret[1];
+        if (ret[3]) {
+            ptr2 = 0; len2 = 0;
+            throw takeFromExternrefTable0(ret[2]);
+        }
+        deferred3_0 = ptr2;
+        deferred3_1 = len2;
+        return getStringFromWasm0(ptr2, len2);
+    } finally {
+        wasm.__wbindgen_free(deferred3_0, deferred3_1, 1);
+    }
+}
+exports.compile = compile;
+
 /**
  * Compile a Svelte component to client-side JavaScript.
  * @param {string} source
@@ -199,7 +234,7 @@ exports.lint = lint;
 
 /**
  * The full catalog of diagnostic ids [`lint`] can emit (see
- * [`crate::json_api::lint_rules`]).
+ * `rsvelte_lint::json_api::lint_rules`).
  * @returns {string}
  */
 function lint_rules() {
@@ -234,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
@@ -294,9 +358,41 @@ exports.version = version;
 function __wbg_get_imports() {
     const import0 = {
         __proto__: null,
+        __wbg___wbindgen_boolean_get_fa956cfa2d1bd751: function(arg0) {
+            const v = arg0;
+            const ret = typeof(v) === 'boolean' ? v : undefined;
+            return isLikeNone(ret) ? 0xFFFFFF : ret ? 1 : 0;
+        },
+        __wbg___wbindgen_is_function_1ff95bcc5517c252: function(arg0) {
+            const ret = typeof(arg0) === 'function';
+            return ret;
+        },
+        __wbg___wbindgen_is_null_ea9085d691f535d3: function(arg0) {
+            const ret = arg0 === null;
+            return ret;
+        },
+        __wbg___wbindgen_is_undefined_c05833b95a3cf397: function(arg0) {
+            const ret = arg0 === undefined;
+            return ret;
+        },
+        __wbg___wbindgen_string_get_b0ca35b86a603356: function(arg0, arg1) {
+            const obj = arg1;
+            const ret = typeof(obj) === 'string' ? obj : undefined;
+            var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+            var len1 = WASM_VECTOR_LEN;
+            getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+            getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+        },
         __wbg___wbindgen_throw_344f42d3211c4765: function(arg0, arg1) {
             throw new Error(getStringFromWasm0(arg0, arg1));
         },
+        __wbg__wbg_cb_unref_fffb441def202758: function(arg0) {
+            arg0._wbg_cb_unref();
+        },
+        __wbg_call_a6e5c5dce5018821: function() { return handleError(function (arg0, arg1, arg2) {
+            const ret = arg0.call(arg1, arg2);
+            return ret;
+        }, arguments); },
         __wbg_error_a6fa202b58aa1cd3: function(arg0, arg1) {
             let deferred0_0;
             let deferred0_1;
@@ -308,10 +404,26 @@ function __wbg_get_imports() {
                 wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
             }
         },
+        __wbg_get_78f252d074a84d0b: function() { return handleError(function (arg0, arg1) {
+            const ret = Reflect.get(arg0, arg1);
+            return ret;
+        }, arguments); },
         __wbg_new_227d7c05414eb861: function() {
             const ret = new Error();
             return ret;
         },
+        __wbg_new_da52cf8fe3429cb2: function() {
+            const ret = new Object();
+            return ret;
+        },
+        __wbg_parse_1c0d8a8656d7e016: function() { return handleError(function (arg0, arg1) {
+            const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
+            return ret;
+        }, arguments); },
+        __wbg_set_8535240470bf2500: function() { return handleError(function (arg0, arg1, arg2) {
+            const ret = Reflect.set(arg0, arg1, arg2);
+            return ret;
+        }, arguments); },
         __wbg_stack_3b0d974bbf31e44f: function(arg0, arg1) {
             const ret = arg1.stack;
             const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -319,6 +431,16 @@ function __wbg_get_imports() {
             getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
             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: 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) {
+            // Cast intrinsic for `Ref(String) -> Externref`.
+            const ret = getStringFromWasm0(arg0, arg1);
+            return ret;
+        },
         __wbindgen_init_externref_table: function() {
             const table = wasm.__wbindgen_externrefs;
             const offset = table.grow(4);
@@ -335,6 +457,21 @@ function __wbg_get_imports() {
     };
 }
 
+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_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]);
+    } finally {
+        wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
+    }
+}
+
 const CompileResultWasmFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_compileresultwasm_free(ptr, 1));
@@ -342,6 +479,16 @@ const ParseResultWasmFinalization = (typeof FinalizationRegistry === 'undefined'
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_parseresultwasm_free(ptr, 1));
 
+function addToExternrefTable0(obj) {
+    const idx = wasm.__externref_table_alloc();
+    wasm.__wbindgen_externrefs.set(idx, obj);
+    return idx;
+}
+
+const CLOSURE_DTORS = (typeof FinalizationRegistry === 'undefined')
+    ? { register: () => {}, unregister: () => {} }
+    : new FinalizationRegistry(state => wasm.__wbindgen_destroy_closure(state.a, state.b));
+
 let cachedDataViewMemory0 = null;
 function getDataViewMemory0() {
     if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
@@ -362,6 +509,44 @@ function getUint8ArrayMemory0() {
     return cachedUint8ArrayMemory0;
 }
 
+function handleError(f, args) {
+    try {
+        return f.apply(this, args);
+    } catch (e) {
+        const idx = addToExternrefTable0(e);
+        wasm.__wbindgen_exn_store(idx);
+    }
+}
+
+function isLikeNone(x) {
+    return x === undefined || x === null;
+}
+
+function makeClosure(arg0, arg1, f) {
+    const state = { a: arg0, b: arg1, cnt: 1 };
+    const real = (...args) => {
+
+        // First up with a closure we increment the internal reference
+        // count. This ensures that the Rust closure environment won't
+        // be deallocated while we're invoking it.
+        state.cnt++;
+        try {
+            return f(state.a, state.b, ...args);
+        } finally {
+            real._wbg_cb_unref();
+        }
+    };
+    real._wbg_cb_unref = () => {
+        if (--state.cnt === 0) {
+            wasm.__wbindgen_destroy_closure(state.a, state.b);
+            state.a = 0;
+            CLOSURE_DTORS.unregister(state);
+        }
+    };
+    CLOSURE_DTORS.register(real, state, state);
+    return real;
+}
+
 function passStringToWasm0(arg, malloc, realloc) {
     if (realloc === undefined) {
         const buf = cachedTextEncoder.encode(arg);
@@ -399,6 +584,12 @@ function passStringToWasm0(arg, malloc, realloc) {
     return ptr;
 }
 
+function takeFromExternrefTable0(idx) {
+    const value = wasm.__wbindgen_externrefs.get(idx);
+    wasm.__externref_table_dealloc(idx);
+    return value;
+}
+
 let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 cachedTextDecoder.decode();
 function decodeText(ptr, len) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsvelte/language-server",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Language Server for rsvelte — formatting (native rsvelte-fmt) and linting (bundled rsvelte_lint wasm)",
   "license": "MIT",
   "repository": {