decorated-pi 0.3.0 → 0.4.1

package/extensions/lsp/servers.ts

@@ -1,237 +1,157 @@
 /**
- * LSP Server Config — language detection, server commands, workspace roots
- *
- * Based on @spences10/pi-lsp by Scott Spence
- * https://github.com/spences10/my-pi/tree/main/packages/pi-lsp (MIT License)
- *
- * Modifications: added C/C++ (clangd) and Lua support
+ * LSP Server Config — language detection, server commands, workspace roots.
  */
 import { existsSync } from "node:fs";
 import { dirname, extname, isAbsolute, join, resolve } from "node:path";
 
+// ─── File extension → language mapping ────────────────────────────────────
+
 const EXTENSION_LANGUAGES: Record<string, string> = {
-  ".ts": "typescript",
-  ".tsx": "typescript",
-  ".mts": "typescript",
-  ".cts": "typescript",
-  ".js": "typescript",
-  ".jsx": "typescript",
-  ".mjs": "typescript",
-  ".cjs": "typescript",
-  ".c": "c",
-  ".h": "cpp",
-  ".cc": "cpp",
-  ".cp": "cpp",
-  ".cpp": "cpp",
-  ".cxx": "cpp",
-  ".hh": "cpp",
-  ".hpp": "cpp",
-  ".hxx": "cpp",
-  ".ipp": "cpp",
-  ".ixx": "cpp",
-  ".tpp": "cpp",
-  ".py": "python",
-  ".rs": "rust",
-  ".go": "go",
-  ".rb": "ruby",
-  ".java": "java",
-  ".lua": "lua",
-  ".svelte": "svelte",
+  ".ts": "typescript", ".tsx": "typescript", ".mts": "typescript", ".cts": "typescript",
+  ".js": "typescript", ".jsx": "typescript", ".mjs": "typescript", ".cjs": "typescript",
+  ".c": "c", ".h": "cpp", ".cc": "cpp", ".cp": "cpp", ".cpp": "cpp",
+  ".cxx": "cpp", ".hh": "cpp", ".hpp": "cpp", ".hxx": "cpp",
+  ".py": "python", ".rs": "rust", ".go": "go", ".rb": "ruby",
+  ".java": "java", ".lua": "lua", ".svelte": "svelte",
+  ".json": "json",
 };
 
-export type LanguageConfig = {
+export interface LanguageConfig {
   language: string;
   command: string;
   args: string[];
   install_hint: string;
   is_project_local?: boolean;
-};
+}
 
 const LANGUAGE_SERVERS: Record<string, Omit<LanguageConfig, "is_project_local">> = {
   typescript: {
-    language: "typescript",
-    command: "typescript-language-server",
+    language: "typescript", command: "typescript-language-server",
     args: ["--stdio"],
-    install_hint:
-      "Install TypeScript LSP with: pnpm add -D typescript typescript-language-server",
+    install_hint: "Install TypeScript LSP with: pnpm add -D typescript typescript-language-server",
   },
   c: {
-    language: "c",
-    command: "clangd",
-    args: ["--background-index"],
+    language: "c", command: "clangd", args: ["--background-index"],
     install_hint: "Install clangd and ensure the clangd binary is on PATH.",
   },
   cpp: {
-    language: "cpp",
-    command: "clangd",
-    args: ["--background-index"],
+    language: "cpp", command: "clangd", args: ["--background-index"],
     install_hint: "Install clangd and ensure the clangd binary is on PATH.",
   },
   python: {
-    language: "python",
-    command: "pylsp",
-    args: [],
+    language: "python", command: "pylsp", args: [],
     install_hint: "Install Python LSP with: pip install python-lsp-server",
   },
   rust: {
-    language: "rust",
-    command: "rust-analyzer",
-    args: [],
-    install_hint:
-      "Install Rust Analyzer and ensure the rust-analyzer binary is on PATH.",
+    language: "rust", command: "rust-analyzer", args: [],
+    install_hint: "Install Rust Analyzer and ensure the rust-analyzer binary is on PATH.",
   },
   go: {
-    language: "go",
-    command: "gopls",
-    args: ["serve"],
-    install_hint:
-      "Install Go LSP with: go install golang.org/x/tools/gopls@latest",
+    language: "go", command: "gopls", args: ["serve"],
+    install_hint: "Install Go LSP with: go install golang.org/x/tools/gopls@latest",
   },
   ruby: {
-    language: "ruby",
-    command: "solargraph",
-    args: ["stdio"],
+    language: "ruby", command: "solargraph", args: ["stdio"],
     install_hint: "Install Ruby LSP with: gem install solargraph",
   },
   java: {
-    language: "java",
-    command: "jdtls",
-    args: [],
-    install_hint:
-      "Install Eclipse JDT Language Server and ensure the jdtls binary is on PATH.",
+    language: "java", command: "jdtls", args: [],
+    install_hint: "Install Eclipse JDT Language Server and ensure the jdtls binary is on PATH.",
   },
   lua: {
-    language: "lua",
-    command: "lua-language-server",
-    args: [],
-    install_hint:
-      "Install Lua LSP and ensure the lua-language-server binary is on PATH.",
+    language: "lua", command: "lua-language-server", args: [],
+    install_hint: "Install Lua LSP and ensure the lua-language-server binary is on PATH.",
   },
   svelte: {
-    language: "svelte",
-    command: "svelteserver",
-    args: ["--stdio"],
-    install_hint:
-      "Install Svelte LSP with: pnpm add -D svelte-language-server (or volta install svelte-language-server)",
+    language: "svelte", command: "svelteserver", args: ["--stdio"],
+    install_hint: "Install Svelte LSP with: pnpm add -D svelte-language-server",
+  },
+  json: {
+    language: "json", command: "biome", args: ["lsp-proxy"],
+    install_hint: "Install Biome with: pnpm add -D @biomejs/biome",
   },
 };
 
 const WORKSPACE_MARKERS = [
-  "svelte.config.js",
-  "svelte.config.ts",
-  "tsconfig.json",
-  "jsconfig.json",
-  "package.json",
-  "pyproject.toml",
-  "Cargo.toml",
-  "go.mod",
-  "Gemfile",
-  "pom.xml",
-  "build.gradle",
-  "build.gradle.kts",
-  ".clangd",
-  "compile_commands.json",
-  "compile_flags.txt",
-  "CMakeLists.txt",
-  "meson.build",
-  "Makefile",
+  "svelte.config.js", "svelte.config.ts", "tsconfig.json", "jsconfig.json",
+  "package.json", "pyproject.toml", "Cargo.toml", "go.mod",
+  "Gemfile", "pom.xml", "build.gradle", "build.gradle.kts",
+  ".clangd", "compile_commands.json", "compile_flags.txt",
+  "CMakeLists.txt", "meson.build", "Makefile",
 ];
 
 const REPOSITORY_MARKERS = [
-  "pnpm-workspace.yaml",
-  "package-lock.json",
-  "yarn.lock",
-  "bun.lockb",
-  "bun.lock",
-  ".git",
+  "pnpm-workspace.yaml", "package-lock.json", "yarn.lock",
+  "bun.lockb", "bun.lock", ".git",
 ];
 
-export function detect_language(file_path: string): string | undefined {
-  return EXTENSION_LANGUAGES[extname(file_path).toLowerCase()];
-}
+// ─── Public API ───────────────────────────────────────────────────────────
 
-export function list_supported_languages(): string[] {
-  return Object.keys(LANGUAGE_SERVERS).sort();
+export function detectLanguage(filePath: string): string | undefined {
+  return EXTENSION_LANGUAGES[extname(filePath).toLowerCase()];
 }
 
-function resolve_server_command_info(
-  command: string,
-  cwd: string = process.cwd()
-): { command: string; is_project_local: boolean } {
-  if (
-    !command ||
-    isAbsolute(command) ||
-    command.includes("/") ||
-    command.includes("\\")
-  ) {
-    return { command, is_project_local: false };
-  }
-  for (const dir of ancestor_directories(cwd)) {
-    const local_bin = resolve_local_binary(dir, command);
-    if (local_bin) {
-      return { command: local_bin, is_project_local: true };
-    }
-  }
-  return { command, is_project_local: false };
+export function listSupportedLanguages(): string[] {
+  return Object.keys(LANGUAGE_SERVERS).sort();
 }
 
-export function get_server_config(
+export function getServerConfig(
   language: string,
-  cwd: string = process.cwd()
+  cwd = process.cwd(),
 ): LanguageConfig | undefined {
   const base = LANGUAGE_SERVERS[language];
   if (!base) return undefined;
-  const resolved = resolve_server_command_info(base.command, cwd);
+
+  const resolved = resolveLocalBinary(base.command, cwd);
   return { ...base, command: resolved.command, is_project_local: resolved.is_project_local };
 }
 
-export function language_id_for_file(file_path: string): string | undefined {
-  return detect_language(file_path);
+export function languageIdForFile(filePath: string): string | undefined {
+  return detectLanguage(filePath);
 }
 
-export function find_workspace_root(
-  file_path: string,
-  fallback: string = process.cwd()
+export function findWorkspaceRoot(
+  filePath: string,
+  fallback = process.cwd(),
 ): string {
-  const start = resolve(dirname(file_path));
-  const project_root = find_nearest_marker_directory(start, WORKSPACE_MARKERS);
-  if (project_root) return project_root;
-  const repo_root = find_nearest_marker_directory(start, REPOSITORY_MARKERS);
-  if (repo_root) return repo_root;
+  const start = resolve(dirname(filePath));
+  const projectRoot = findNearestMarker(start, WORKSPACE_MARKERS);
+  if (projectRoot) return projectRoot;
+  const repoRoot = findNearestMarker(start, REPOSITORY_MARKERS);
+  if (repoRoot) return repoRoot;
   return resolve(fallback);
 }
 
-function find_nearest_marker_directory(
-  start: string,
-  markers: string[]
-): string | undefined {
-  for (const dir of ancestor_directories(start)) {
-    if (markers.some((marker) => existsSync(join(dir, marker)))) {
-      return dir;
-    }
+// ─── Internal helpers ─────────────────────────────────────────────────────
+
+function resolveLocalBinary(
+  command: string,
+  cwd: string,
+): { command: string; is_project_local: boolean } {
+  if (isAbsolute(command) || command.includes("/") || command.includes("\\")) {
+    return { command, is_project_local: false };
+  }
+  for (const dir of ancestorDirs(cwd)) {
+    const localBin = join(dir, "node_modules", ".bin", command);
+    if (existsSync(localBin)) return { command: localBin, is_project_local: true };
+    if (existsSync(localBin + ".cmd")) return { command: localBin + ".cmd", is_project_local: true };
+  }
+  return { command, is_project_local: false };
+}
+
+function findNearestMarker(start: string, markers: string[]): string | undefined {
+  for (const dir of ancestorDirs(start)) {
+    if (markers.some((m) => existsSync(join(dir, m)))) return dir;
   }
   return undefined;
 }
 
-function ancestor_directories(start: string): string[] {
-  const dirs: string[] = [];
+function* ancestorDirs(start: string): Generator<string> {
   let current = resolve(start);
   while (true) {
-    dirs.push(current);
+    yield current;
     const parent = dirname(current);
     if (parent === current) break;
     current = parent;
   }
-  return dirs;
-}
-
-function resolve_local_binary(
-  directory: string,
-  command: string
-): string | undefined {
-  const candidates = [
-    join(directory, "node_modules", ".bin", command),
-    join(directory, "node_modules", ".bin", `${command}.cmd`),
-  ];
-  return candidates.find((candidate) => existsSync(candidate));
 }