march-cli 0.1.21 → 0.1.23

package/src/lsp/diagnostics-format.mjs

@@ -1,72 +1,72 @@
-import { sameLspPath } from "./path-match.mjs";
-
-const MAX_DIAGNOSTICS = 20;
-
-export function formatLspDiagnostics({ snapshot } = {}) {
-  const diagnostics = snapshot?.diagnostics ?? [];
-  if (diagnostics.length === 0) return "[diagnostics]";
-
-  const sorted = [...diagnostics].sort((a, b) => severityRank(a.severity) - severityRank(b.severity));
-
-  const counts = countSeverities(diagnostics);
-  const lines = ["[diagnostics]", "source: lsp"];
-  if (snapshot?.status) lines.push(`status: ${snapshot.status}`);
-  lines.push(`summary: ${formatSummary(counts)}${diagnostics.length > MAX_DIAGNOSTICS ? `, showing ${MAX_DIAGNOSTICS} of ${diagnostics.length}` : ""}`);
-  lines.push("");
-  for (const diagnostic of sorted.slice(0, MAX_DIAGNOSTICS)) {
-    lines.push(formatDiagnostic(diagnostic));
-  }
-  return lines.join("\n");
-}
-
-export function formatLspDiagnosticsForPath({ snapshot, path } = {}) {
-  const targetPath = String(path ?? "");
-  if (!targetPath) return "";
-  const diagnostics = (snapshot?.diagnostics ?? []).filter((diagnostic) => sameLspPath(diagnostic.path, targetPath));
-  if (diagnostics.length === 0) return "";
-  return formatLspDiagnostics({
-    snapshot: {
-      ...snapshot,
-      diagnostics,
-    },
-  });
-}
-
-function formatDiagnostic(diagnostic) {
-  const severity = formatSeverity(diagnostic.severity);
-  const line = (diagnostic.range?.start?.line ?? 0) + 1;
-  const col = (diagnostic.range?.start?.character ?? 0) + 1;
-  const code = diagnostic.code == null ? "" : ` ${diagnostic.code}`;
-  const source = diagnostic.source ?? diagnostic.serverId ?? "lsp";
-  return `- ${severity} ${source} ${diagnostic.path}:${line}:${col}${code}\n  ${singleLine(diagnostic.message ?? "")}`;
-}
-
-function countSeverities(diagnostics) {
-  const counts = { error: 0, warning: 0, info: 0, hint: 0 };
-  for (const diagnostic of diagnostics) counts[formatSeverity(diagnostic.severity)]++;
-  return counts;
-}
-
-function formatSummary(counts) {
-  return [
-    [counts.error, "errors"],
-    [counts.warning, "warnings"],
-    [counts.info, "info"],
-    [counts.hint, "hints"],
-  ].filter(([count]) => count > 0).map(([count, label]) => `${count} ${label}`).join(", ") || "0 diagnostics";
-}
-
-function formatSeverity(severity) {
-  if (severity === 2) return "warning";
-  if (severity === 3) return "info";
-  if (severity === 4) return "hint";
-  return "error";
-}
-
-function severityRank(severity) {
-  return { error: 0, warning: 1, info: 2, hint: 3 }[formatSeverity(severity)] ?? 4;
-}
-
-function singleLine(text) {
-  return String(text).replace(/\s+/g, " ").trim();
-}
+import { sameLspPath } from "./path-match.mjs";
+
+const MAX_DIAGNOSTICS = 20;
+
+export function formatLspDiagnostics({ snapshot } = {}) {
+  const diagnostics = snapshot?.diagnostics ?? [];
+  if (diagnostics.length === 0) return "[diagnostics]";
+
+  const sorted = [...diagnostics].sort((a, b) => severityRank(a.severity) - severityRank(b.severity));
+
+  const counts = countSeverities(diagnostics);
+  const lines = ["[diagnostics]", "source: lsp"];
+  if (snapshot?.status) lines.push(`status: ${snapshot.status}`);
+  lines.push(`summary: ${formatSummary(counts)}${diagnostics.length > MAX_DIAGNOSTICS ? `, showing ${MAX_DIAGNOSTICS} of ${diagnostics.length}` : ""}`);
+  lines.push("");
+  for (const diagnostic of sorted.slice(0, MAX_DIAGNOSTICS)) {
+    lines.push(formatDiagnostic(diagnostic));
+  }
+  return lines.join("\n");
+}
+
+export function formatLspDiagnosticsForPath({ snapshot, path } = {}) {
+  const targetPath = String(path ?? "");
+  if (!targetPath) return "";
+  const diagnostics = (snapshot?.diagnostics ?? []).filter((diagnostic) => sameLspPath(diagnostic.path, targetPath));
+  if (diagnostics.length === 0) return "";
+  return formatLspDiagnostics({
+    snapshot: {
+      ...snapshot,
+      diagnostics,
+    },
+  });
+}
+
+function formatDiagnostic(diagnostic) {
+  const severity = formatSeverity(diagnostic.severity);
+  const line = (diagnostic.range?.start?.line ?? 0) + 1;
+  const col = (diagnostic.range?.start?.character ?? 0) + 1;
+  const code = diagnostic.code == null ? "" : ` ${diagnostic.code}`;
+  const source = diagnostic.source ?? diagnostic.serverId ?? "lsp";
+  return `- ${severity} ${source} ${diagnostic.path}:${line}:${col}${code}\n  ${singleLine(diagnostic.message ?? "")}`;
+}
+
+function countSeverities(diagnostics) {
+  const counts = { error: 0, warning: 0, info: 0, hint: 0 };
+  for (const diagnostic of diagnostics) counts[formatSeverity(diagnostic.severity)]++;
+  return counts;
+}
+
+function formatSummary(counts) {
+  return [
+    [counts.error, "errors"],
+    [counts.warning, "warnings"],
+    [counts.info, "info"],
+    [counts.hint, "hints"],
+  ].filter(([count]) => count > 0).map(([count, label]) => `${count} ${label}`).join(", ") || "0 diagnostics";
+}
+
+function formatSeverity(severity) {
+  if (severity === 2) return "warning";
+  if (severity === 3) return "info";
+  if (severity === 4) return "hint";
+  return "error";
+}
+
+function severityRank(severity) {
+  return { error: 0, warning: 1, info: 2, hint: 3 }[formatSeverity(severity)] ?? 4;
+}
+
+function singleLine(text) {
+  return String(text).replace(/\s+/g, " ").trim();
+}

package/src/lsp/managed-node-server.mjs

@@ -1,99 +1,99 @@
-import { existsSync, mkdirSync, writeFileSync } from "node:fs";
-import { spawnCommand } from "../platform/spawn-command.mjs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-
-const DEFAULT_CACHE_ROOT = join(homedir(), ".march", "lsp", "node");
-
-const MANAGED_PACKAGES = {
-  "typescript-language-server": ["typescript-language-server", "typescript"],
-  "vue-language-server": ["@vue/language-server", "typescript"],
-  "pyright-langserver": ["pyright"],
-  "vscode-json-language-server": ["vscode-langservers-extracted"],
-  "vscode-html-language-server": ["vscode-langservers-extracted"],
-  "vscode-css-language-server": ["vscode-langservers-extracted"],
-  "docker-langserver": ["dockerfile-language-server-nodejs"],
-};
-
-const installs = new Map();
-
-export function getManagedNodeLspRoot() {
-  return process.env.MARCH_LSP_NODE_ROOT || DEFAULT_CACHE_ROOT;
-}
-
-export async function ensureManagedNodeCommand(name) {
-  if (!MANAGED_PACKAGES[name]) return null;
-  const root = getManagedNodeLspRoot();
-  const existing = findManagedBin(name, root);
-  if (existing) return { command: existing, root, installed: false };
-
-  await ensureManagedPackages(name, root);
-  const command = findManagedBin(name, root);
-  if (!command) throw new Error(`managed install did not provide ${name}`);
-  return { command, root, installed: true };
-}
-
-export async function ensureManagedTypeScript() {
-  const root = getManagedNodeLspRoot();
-  if (findManagedTypeScriptServer()) return { root, installed: false };
-  await installPackages(root, ["typescript"]);
-  if (!findManagedTypeScriptServer()) throw new Error("managed install did not provide typescript");
-  return { root, installed: true };
-}
-
-export function findManagedTypeScriptServer() {
-  const root = getManagedNodeLspRoot();
-  const tsserver = join(root, "node_modules", "typescript", "lib", "tsserver.js");
-  return existsSync(tsserver) ? tsserver : null;
-}
-
-export function findManagedTypeScriptSdk() {
-  const root = getManagedNodeLspRoot();
-  const lib = join(root, "node_modules", "typescript", "lib");
-  return existsSync(join(lib, "tsserverlibrary.js")) || existsSync(join(lib, "tsserver.js")) ? lib : null;
-}
-
-async function ensureManagedPackages(name, root) {
-  const key = `${root}:${name}`;
-  if (!installs.has(key)) {
-    installs.set(key, installPackages(root, MANAGED_PACKAGES[name]).finally(() => installs.delete(key)));
-  }
-  return await installs.get(key);
-}
-
-async function installPackages(root, packages) {
-  mkdirSync(root, { recursive: true });
-  const packageJson = join(root, "package.json");
-  if (!existsSync(packageJson)) writeFileSync(packageJson, JSON.stringify({ private: true, name: "march-managed-lsp" }, null, 2));
-  const npm = process.platform === "win32" ? "npm.cmd" : "npm";
-  await run(npm, ["install", "--no-audit", "--no-fund", "--save-exact", ...packages], { cwd: root });
-}
-
-function findManagedBin(name, root) {
-  for (const bin of platformCommandNames(name)) {
-    const candidate = join(root, "node_modules", ".bin", bin);
-    if (existsSync(candidate)) return candidate;
-  }
-  return null;
-}
-
-function platformCommandNames(name) {
-  if (process.platform !== "win32") return [name];
-  return [`${name}.cmd`, `${name}.exe`, name];
-}
-
-function run(command, args, { cwd }) {
-  return new Promise((resolve, reject) => {
-    const child = spawnCommand(command, args, { cwd, stdio: ["ignore", "ignore", "pipe"], windowsHide: true });
-    let stderr = "";
-    child.stderr.on("data", (chunk) => {
-      stderr += chunk.toString("utf8");
-      if (stderr.length > 4000) stderr = stderr.slice(-4000);
-    });
-    child.on("error", reject);
-    child.on("exit", (code) => {
-      if (code === 0) resolve();
-      else reject(new Error(`${command} ${args.join(" ")} failed with exit ${code}${stderr ? `: ${stderr.trim()}` : ""}`));
-    });
-  });
-}
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { spawnCommand } from "../platform/spawn-command.mjs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+const DEFAULT_CACHE_ROOT = join(homedir(), ".march", "lsp", "node");
+
+const MANAGED_PACKAGES = {
+  "typescript-language-server": ["typescript-language-server", "typescript"],
+  "vue-language-server": ["@vue/language-server", "typescript"],
+  "pyright-langserver": ["pyright"],
+  "vscode-json-language-server": ["vscode-langservers-extracted"],
+  "vscode-html-language-server": ["vscode-langservers-extracted"],
+  "vscode-css-language-server": ["vscode-langservers-extracted"],
+  "docker-langserver": ["dockerfile-language-server-nodejs"],
+};
+
+const installs = new Map();
+
+export function getManagedNodeLspRoot() {
+  return process.env.MARCH_LSP_NODE_ROOT || DEFAULT_CACHE_ROOT;
+}
+
+export async function ensureManagedNodeCommand(name) {
+  if (!MANAGED_PACKAGES[name]) return null;
+  const root = getManagedNodeLspRoot();
+  const existing = findManagedBin(name, root);
+  if (existing) return { command: existing, root, installed: false };
+
+  await ensureManagedPackages(name, root);
+  const command = findManagedBin(name, root);
+  if (!command) throw new Error(`managed install did not provide ${name}`);
+  return { command, root, installed: true };
+}
+
+export async function ensureManagedTypeScript() {
+  const root = getManagedNodeLspRoot();
+  if (findManagedTypeScriptServer()) return { root, installed: false };
+  await installPackages(root, ["typescript"]);
+  if (!findManagedTypeScriptServer()) throw new Error("managed install did not provide typescript");
+  return { root, installed: true };
+}
+
+export function findManagedTypeScriptServer() {
+  const root = getManagedNodeLspRoot();
+  const tsserver = join(root, "node_modules", "typescript", "lib", "tsserver.js");
+  return existsSync(tsserver) ? tsserver : null;
+}
+
+export function findManagedTypeScriptSdk() {
+  const root = getManagedNodeLspRoot();
+  const lib = join(root, "node_modules", "typescript", "lib");
+  return existsSync(join(lib, "tsserverlibrary.js")) || existsSync(join(lib, "tsserver.js")) ? lib : null;
+}
+
+async function ensureManagedPackages(name, root) {
+  const key = `${root}:${name}`;
+  if (!installs.has(key)) {
+    installs.set(key, installPackages(root, MANAGED_PACKAGES[name]).finally(() => installs.delete(key)));
+  }
+  return await installs.get(key);
+}
+
+async function installPackages(root, packages) {
+  mkdirSync(root, { recursive: true });
+  const packageJson = join(root, "package.json");
+  if (!existsSync(packageJson)) writeFileSync(packageJson, JSON.stringify({ private: true, name: "march-managed-lsp" }, null, 2));
+  const npm = process.platform === "win32" ? "npm.cmd" : "npm";
+  await run(npm, ["install", "--no-audit", "--no-fund", "--save-exact", ...packages], { cwd: root });
+}
+
+function findManagedBin(name, root) {
+  for (const bin of platformCommandNames(name)) {
+    const candidate = join(root, "node_modules", ".bin", bin);
+    if (existsSync(candidate)) return candidate;
+  }
+  return null;
+}
+
+function platformCommandNames(name) {
+  if (process.platform !== "win32") return [name];
+  return [`${name}.cmd`, `${name}.exe`, name];
+}
+
+function run(command, args, { cwd }) {
+  return new Promise((resolve, reject) => {
+    const child = spawnCommand(command, args, { cwd, stdio: ["ignore", "ignore", "pipe"], windowsHide: true });
+    let stderr = "";
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk.toString("utf8");
+      if (stderr.length > 4000) stderr = stderr.slice(-4000);
+    });
+    child.on("error", reject);
+    child.on("exit", (code) => {
+      if (code === 0) resolve();
+      else reject(new Error(`${command} ${args.join(" ")} failed with exit ${code}${stderr ? `: ${stderr.trim()}` : ""}`));
+    });
+  });
+}

package/src/lsp/path-match.mjs

@@ -1,10 +1,10 @@
-import { normalize } from "node:path";
-
-export function sameLspPath(left, right) {
-  return lspPathKey(left) === lspPathKey(right);
-}
-
-export function lspPathKey(path) {
-  const normalized = normalize(String(path ?? ""));
-  return process.platform === "win32" ? normalized.toLowerCase() : normalized;
-}
+import { normalize } from "node:path";
+
+export function sameLspPath(left, right) {
+  return lspPathKey(left) === lspPathKey(right);
+}
+
+export function lspPathKey(path) {
+  const normalized = normalize(String(path ?? ""));
+  return process.platform === "win32" ? normalized.toLowerCase() : normalized;
+}