@spences10/pi-lsp 0.0.22 → 0.0.24

package/dist/client/diagnostics.d.ts

@@ -0,0 +1,17 @@
+import type { EventEmitter } from 'node:events';
+import type { LspRange } from './protocol.js';
+export interface LspDiagnostic {
+    range: LspRange;
+    severity?: 1 | 2 | 3 | 4;
+    code?: string | number;
+    source?: string;
+    message: string;
+}
+export declare class LspDiagnosticsStore {
+    #private;
+    constructor(events: EventEmitter);
+    get(uri: string): LspDiagnostic[];
+    publish(uri: string, diagnostics: LspDiagnostic[]): void;
+    wait(uri: string, timeout_ms?: number): Promise<LspDiagnostic[]>;
+    flush_waiters(): void;
+}

package/dist/client/diagnostics.js

@@ -0,0 +1,46 @@
+export class LspDiagnosticsStore {
+    #diagnostics_by_uri = new Map();
+    #diagnostic_waiters = new Set();
+    #events;
+    constructor(events) {
+        this.#events = events;
+    }
+    get(uri) {
+        return this.#diagnostics_by_uri.get(uri) ?? [];
+    }
+    publish(uri, diagnostics) {
+        this.#diagnostics_by_uri.set(uri, diagnostics);
+        this.#events.emit('diagnostics', uri);
+    }
+    async wait(uri, timeout_ms = 1500) {
+        if (this.#diagnostics_by_uri.has(uri)) {
+            return this.get(uri);
+        }
+        return new Promise((resolve) => {
+            let active = true;
+            const cleanup = () => {
+                if (!active)
+                    return;
+                active = false;
+                this.#events.off('diagnostics', handler);
+                clearTimeout(timer);
+                this.#diagnostic_waiters.delete(cleanup);
+                resolve(this.get(uri));
+            };
+            const handler = (event_uri) => {
+                if (event_uri !== uri)
+                    return;
+                cleanup();
+            };
+            const timer = setTimeout(cleanup, timeout_ms);
+            this.#events.on('diagnostics', handler);
+            this.#diagnostic_waiters.add(cleanup);
+        });
+    }
+    flush_waiters() {
+        for (const cleanup of Array.from(this.#diagnostic_waiters)) {
+            cleanup();
+        }
+    }
+}
+//# sourceMappingURL=diagnostics.js.map

package/dist/client/diagnostics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/client/diagnostics.ts"],"names":[],"mappings":"AAWA,MAAM,OAAO,mBAAmB;IACtB,mBAAmB,GAAG,IAAI,GAAG,EAA2B,CAAC;IACzD,mBAAmB,GAAG,IAAI,GAAG,EAAc,CAAC;IAC5C,OAAO,CAAe;IAE/B,YAAY,MAAoB;QAC/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,GAAW;QACd,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAChD,CAAC;IAED,OAAO,CAAC,GAAW,EAAE,WAA4B;QAChD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,IAAI,CACT,GAAW,EACX,UAAU,GAAG,IAAI;QAEjB,IAAI,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9B,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,MAAM,OAAO,GAAG,GAAG,EAAE;gBACpB,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACpB,MAAM,GAAG,KAAK,CAAC;gBACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;gBACzC,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACzC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACxB,CAAC,CAAC;YACF,MAAM,OAAO,GAAG,CAAC,SAAiB,EAAE,EAAE;gBACrC,IAAI,SAAS,KAAK,GAAG;oBAAE,OAAO;gBAC9B,OAAO,EAAE,CAAC;YACX,CAAC,CAAC;YACF,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAC9C,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YACxC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,aAAa;QACZ,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC5D,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC;CACD"}

package/dist/client/lifecycle.d.ts

@@ -0,0 +1,28 @@
+import { type ChildProcess } from 'node:child_process';
+export interface LspClientOptions {
+    command: string;
+    args: string[];
+    root_uri: string;
+    language_id_for_uri: (uri: string) => string | undefined;
+    request_timeout_ms?: number;
+}
+export declare class LspClientStartError extends Error {
+    command: string;
+    args: string[];
+    code?: string;
+    constructor(message: string, options: {
+        command: string;
+        args: string[];
+        cause?: unknown;
+        code?: string;
+    });
+}
+export interface LspProcessHandlers {
+    on_stdout: (chunk: Buffer) => void;
+    on_error: (error: Error) => void;
+    on_close: () => void;
+}
+export declare function start_lsp_process(options: LspClientOptions, handlers: LspProcessHandlers): ChildProcess;
+export declare function create_start_error(options: LspClientOptions, message: string, cause?: unknown, code?: string): LspClientStartError;
+export declare function create_initialize_params(options: LspClientOptions): unknown;
+export declare function error_code(error: unknown): string | undefined;

package/dist/client/lifecycle.js

@@ -0,0 +1,70 @@
+import { spawn } from 'node:child_process';
+import { create_child_process_env } from '../env.js';
+export class LspClientStartError extends Error {
+    command;
+    args;
+    code;
+    constructor(message, options) {
+        super(message, options.cause ? { cause: options.cause } : undefined);
+        this.name = 'LspClientStartError';
+        this.command = options.command;
+        this.args = options.args;
+        this.code = options.code;
+    }
+}
+export function start_lsp_process(options, handlers) {
+    const proc = spawn(options.command, options.args, {
+        stdio: ['pipe', 'pipe', 'pipe'],
+        env: create_child_process_env(),
+    });
+    proc.on('error', handlers.on_error);
+    proc.on('close', handlers.on_close);
+    proc.stderr?.on('data', () => {
+        // Discard stderr; many servers are chatty.
+    });
+    proc.stdout.on('data', handlers.on_stdout);
+    return proc;
+}
+export function create_start_error(options, message, cause, code) {
+    return new LspClientStartError(message, {
+        command: options.command,
+        args: options.args,
+        cause,
+        code,
+    });
+}
+export function create_initialize_params(options) {
+    return {
+        processId: process.pid,
+        rootUri: options.root_uri,
+        capabilities: {
+            textDocument: {
+                publishDiagnostics: {
+                    relatedInformation: true,
+                },
+                hover: {
+                    contentFormat: ['markdown', 'plaintext'],
+                },
+                definition: { linkSupport: false },
+                references: {},
+                documentSymbol: {
+                    hierarchicalDocumentSymbolSupport: true,
+                },
+            },
+            workspace: {
+                workspaceFolders: true,
+                symbol: {},
+            },
+        },
+        workspaceFolders: [{ uri: options.root_uri, name: 'workspace' }],
+    };
+}
+export function error_code(error) {
+    return typeof error === 'object' &&
+        error !== null &&
+        'code' in error &&
+        typeof error.code === 'string'
+        ? error.code
+        : undefined;
+}
+//# sourceMappingURL=lifecycle.js.map

package/dist/client/lifecycle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/client/lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAUrD,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAC7C,OAAO,CAAS;IAChB,IAAI,CAAW;IACf,IAAI,CAAU;IAEd,YACC,OAAe,EACf,OAKC;QAED,KAAK,CACJ,OAAO,EACP,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CACpD,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,CAAC;CACD;AAQD,MAAM,UAAU,iBAAiB,CAChC,OAAyB,EACzB,QAA4B;IAE5B,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE;QACjD,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAC/B,GAAG,EAAE,wBAAwB,EAAE;KAC/B,CAAC,CAAC;IAEH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;QAC5B,2CAA2C;IAC5C,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IAE5C,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,UAAU,kBAAkB,CACjC,OAAyB,EACzB,OAAe,EACf,KAAe,EACf,IAAa;IAEb,OAAO,IAAI,mBAAmB,CAAC,OAAO,EAAE;QACvC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK;QACL,IAAI;KACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACvC,OAAyB;IAEzB,OAAO;QACN,SAAS,EAAE,OAAO,CAAC,GAAG;QACtB,OAAO,EAAE,OAAO,CAAC,QAAQ;QACzB,YAAY,EAAE;YACb,YAAY,EAAE;gBACb,kBAAkB,EAAE;oBACnB,kBAAkB,EAAE,IAAI;iBACxB;gBACD,KAAK,EAAE;oBACN,aAAa,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC;iBACxC;gBACD,UAAU,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;gBAClC,UAAU,EAAE,EAAE;gBACd,cAAc,EAAE;oBACf,iCAAiC,EAAE,IAAI;iBACvC;aACD;YACD,SAAS,EAAE;gBACV,gBAAgB,EAAE,IAAI;gBACtB,MAAM,EAAE,EAAE;aACV;SACD;QACD,gBAAgB,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;KAChE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAc;IACxC,OAAO,OAAO,KAAK,KAAK,QAAQ;QAC/B,KAAK,KAAK,IAAI;QACd,MAAM,IAAI,KAAK;QACf,OAAQ,KAA4B,CAAC,IAAI,KAAK,QAAQ;QACtD,CAAC,CAAE,KAA0B,CAAC,IAAI;QAClC,CAAC,CAAC,SAAS,CAAC;AACd,CAAC"}

package/dist/client/protocol.d.ts

@@ -0,0 +1,65 @@
+import type { ChildProcess } from 'node:child_process';
+export interface LspPosition {
+    line: number;
+    character: number;
+}
+export interface LspRange {
+    start: LspPosition;
+    end: LspPosition;
+}
+export interface LspLocation {
+    uri: string;
+    range: LspRange;
+}
+export interface LspLocationLink {
+    targetUri: string;
+    targetRange: LspRange;
+    targetSelectionRange?: LspRange;
+    originSelectionRange?: LspRange;
+}
+export interface LspHover {
+    contents: string | {
+        language?: string;
+        value: string;
+    } | {
+        kind: string;
+        value: string;
+    } | Array<string | {
+        language?: string;
+        value: string;
+    } | {
+        kind: string;
+        value: string;
+    }>;
+    range?: LspRange;
+}
+export interface JsonRpcMessage {
+    jsonrpc: '2.0';
+    id?: number | string;
+    method?: string;
+    params?: unknown;
+    result?: unknown;
+    error?: {
+        code: number;
+        message: string;
+        data?: unknown;
+    };
+}
+export interface JsonRpcProtocolOptions {
+    request_timeout_ms?: number;
+    on_error: (error: unknown) => void;
+    on_notification: (message: JsonRpcMessage) => boolean;
+}
+export declare class JsonRpcProtocol {
+    #private;
+    constructor(options: JsonRpcProtocolOptions);
+    attach(proc: ChildProcess): void;
+    receive(chunk: Buffer): void;
+    detach(): void;
+    reject_pending(error: Error): void;
+    request(method: string, params: unknown, timeout_override?: number): Promise<unknown>;
+    notify(method: string, params: unknown): void;
+    send(message: JsonRpcMessage): void;
+    drain_buffer(): void;
+    handle_message(message: JsonRpcMessage): void;
+}

package/dist/client/protocol.js

@@ -0,0 +1,118 @@
+export class JsonRpcProtocol {
+    #proc = null;
+    #next_id = 1;
+    #pending = new Map();
+    #buffer = Buffer.alloc(0);
+    #options;
+    constructor(options) {
+        this.#options = options;
+    }
+    attach(proc) {
+        this.#proc = proc;
+    }
+    receive(chunk) {
+        this.#buffer = Buffer.concat([this.#buffer, chunk]);
+        this.drain_buffer();
+    }
+    detach() {
+        this.#proc = null;
+    }
+    reject_pending(error) {
+        for (const pending of this.#pending.values()) {
+            clearTimeout(pending.timer);
+            pending.reject(error);
+        }
+        this.#pending.clear();
+    }
+    request(method, params, timeout_override) {
+        return new Promise((resolve, reject) => {
+            const id = this.#next_id++;
+            const timeout_ms = timeout_override ??
+                this.#options.request_timeout_ms ??
+                30_000;
+            const timer = setTimeout(() => {
+                if (this.#pending.has(id)) {
+                    this.#pending.delete(id);
+                    reject(new Error(`LSP request ${method} timed out`));
+                }
+            }, timeout_ms);
+            this.#pending.set(id, { resolve, reject, timer });
+            try {
+                this.send({ jsonrpc: '2.0', id, method, params });
+            }
+            catch (error) {
+                clearTimeout(timer);
+                this.#pending.delete(id);
+                reject(error);
+            }
+        });
+    }
+    notify(method, params) {
+        this.send({ jsonrpc: '2.0', method, params });
+    }
+    send(message) {
+        if (!this.#proc?.stdin?.writable) {
+            throw new Error('LSP server not connected');
+        }
+        const body = Buffer.from(JSON.stringify(message), 'utf8');
+        const header = Buffer.from(`Content-Length: ${body.length}\r\n\r\n`, 'ascii');
+        this.#proc.stdin.write(Buffer.concat([header, body]));
+    }
+    drain_buffer() {
+        while (true) {
+            const header_end = this.#buffer.indexOf('\r\n\r\n');
+            if (header_end === -1)
+                return;
+            const header = this.#buffer
+                .subarray(0, header_end)
+                .toString('ascii');
+            const match = header.match(/Content-Length:\s*(\d+)/i);
+            if (!match) {
+                this.#buffer = this.#buffer.subarray(header_end + 4);
+                continue;
+            }
+            const length = Number(match[1]);
+            const body_start = header_end + 4;
+            if (this.#buffer.length < body_start + length)
+                return;
+            const body = this.#buffer.subarray(body_start, body_start + length);
+            this.#buffer = this.#buffer.subarray(body_start + length);
+            try {
+                this.handle_message(JSON.parse(body.toString('utf8')));
+            }
+            catch (error) {
+                this.#options.on_error(error);
+            }
+        }
+    }
+    handle_message(message) {
+        const numeric_id = typeof message.id === 'number'
+            ? message.id
+            : typeof message.id === 'string' && /^-?\d+$/.test(message.id)
+                ? Number(message.id)
+                : null;
+        if (numeric_id != null && this.#pending.has(numeric_id)) {
+            const pending = this.#pending.get(numeric_id);
+            this.#pending.delete(numeric_id);
+            clearTimeout(pending.timer);
+            if (message.error) {
+                pending.reject(new Error(`LSP error ${message.error.code}: ${message.error.message}`));
+            }
+            else {
+                pending.resolve(message.result);
+            }
+            return;
+        }
+        if (this.#options.on_notification(message))
+            return;
+        if (message.method && message.id != null) {
+            // Respond to server-to-client requests we don't implement so it doesn't block.
+            this.send({
+                jsonrpc: '2.0',
+                id: message.id,
+                result: null,
+            });
+        }
+    }
+}
+//# sourceMappingURL=protocol.js.map

package/dist/client/protocol.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../src/client/protocol.ts"],"names":[],"mappings":"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"}

package/dist/client/symbols.d.ts

@@ -0,0 +1,18 @@
+import type { LspLocation, LspLocationLink, LspRange } from './protocol.js';
+export interface LspDocumentSymbol {
+    name: string;
+    kind: number;
+    detail?: string;
+    range: LspRange;
+    selectionRange: LspRange;
+    children?: LspDocumentSymbol[];
+    uri?: string;
+    containerName?: string;
+}
+export declare function normalize_location_result(result: LspLocation | LspLocation[] | LspLocationLink | LspLocationLink[] | null): LspLocation[];
+export declare function normalize_document_symbol_result(result: LspDocumentSymbol[] | Array<{
+    name: string;
+    kind: number;
+    location: LspLocation;
+    containerName?: string;
+}> | null): LspDocumentSymbol[];

package/dist/client/symbols.js

@@ -0,0 +1,31 @@
+export function normalize_location_result(result) {
+    if (!result)
+        return [];
+    const entries = Array.isArray(result) ? result : [result];
+    return entries.map((entry) => {
+        if ('uri' in entry)
+            return entry;
+        return {
+            uri: entry.targetUri,
+            range: entry.targetSelectionRange ?? entry.targetRange,
+        };
+    });
+}
+export function normalize_document_symbol_result(result) {
+    if (!result)
+        return [];
+    if (result.length === 0 ||
+        ('range' in result[0] && 'selectionRange' in result[0])) {
+        return result;
+    }
+    const symbol_info = result;
+    return symbol_info.map((entry) => ({
+        name: entry.name,
+        kind: entry.kind,
+        range: entry.location.range,
+        selectionRange: entry.location.range,
+        containerName: entry.containerName,
+        uri: entry.location.uri,
+    }));
+}
+//# sourceMappingURL=symbols.js.map

package/dist/client/symbols.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"symbols.js","sourceRoot":"","sources":["../../src/client/symbols.ts"],"names":[],"mappings":"AAiBA,MAAM,UAAU,yBAAyB,CACxC,MAKO;IAEP,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC1D,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5B,IAAI,KAAK,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QACjC,OAAO;YACN,GAAG,EAAE,KAAK,CAAC,SAAS;YACpB,KAAK,EAAE,KAAK,CAAC,oBAAoB,IAAI,KAAK,CAAC,WAAW;SACtD,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC/C,MAQO;IAEP,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,IACC,MAAM,CAAC,MAAM,KAAK,CAAC;QACnB,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,gBAAgB,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,EACtD,CAAC;QACF,OAAO,MAA6B,CAAC;IACtC,CAAC;IACD,MAAM,WAAW,GAAG,MAKlB,CAAC;IACH,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClC,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;QAC3B,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;QACpC,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG;KACvB,CAAC,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spences10/pi-lsp",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "Pi extension that exposes Language Server Protocol diagnostics, hover, definition, and reference tools",
   "keywords": [
     "language-server",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@spences10/pi-child-env": "0.1.4",
-    "@spences10/pi-tui-modal": "0.0.13",
+    "@spences10/pi-tui-modal": "0.0.15",
     "@spences10/pi-project-trust": "0.0.6"
   },
   "devDependencies": {
@@ -61,6 +61,8 @@
     "check": "pnpm --filter \"$npm_package_name^...\" run build:self && pnpm run check:self",
     "check:self": "tsc --noEmit -p tsconfig.json",
     "test": "pnpm --filter \"$npm_package_name^...\" run build:self && pnpm run test:self",
-    "test:self": "vitest run"
+    "test:self": "vitest run",
+    "coverage:self": "vitest run --coverage",
+    "coverage": "pnpm --filter \"$npm_package_name^...\" run build:self && pnpm run coverage:self"
   }
 }