diff --git a/apps/desktop/src/lib/__tests__/sqlHighlighter.spec.ts b/apps/desktop/src/lib/__tests__/sqlHighlighter.spec.ts new file mode 100644 index 0000000000..5d731875f7 --- /dev/null +++ b/apps/desktop/src/lib/__tests__/sqlHighlighter.spec.ts @@ -0,0 +1,27 @@ +import { describe, expect, it, vi } from "vitest"; +import { createSafeSqlHighlighter, escapeHtml } from "@/lib/sqlHighlighter"; + +describe("escapeHtml", () => { + it("escapes SQL text for v-html fallback rendering", () => { + expect(escapeHtml(`SELECT '' AS "name" & col`)).toBe("SELECT '<tag>' AS "name" & col"); + }); +}); + +describe("createSafeSqlHighlighter", () => { + it("falls back to escaped SQL when Shiki highlighting fails", () => { + const warn = vi.spyOn(console, "warn").mockImplementation(() => {}); + const highlighter = createSafeSqlHighlighter( + { + codeToHtml: () => { + throw new SyntaxError("Invalid regular expression: invalid group specifier name"); + }, + }, + { appearance: () => "light" }, + ); + + expect(highlighter(`ALTER TABLE t ADD "" INT;`)).toBe("ALTER TABLE t ADD "<x>" INT;"); + expect(warn).toHaveBeenCalledOnce(); + + warn.mockRestore(); + }); +}); diff --git a/apps/desktop/src/lib/sqlHighlighter.ts b/apps/desktop/src/lib/sqlHighlighter.ts index d7b4cc8f1e..ef9116bec4 100644 --- a/apps/desktop/src/lib/sqlHighlighter.ts +++ b/apps/desktop/src/lib/sqlHighlighter.ts @@ -12,17 +12,50 @@ const SHIKI_THEMES = { } as const; type ShikiHighlighter = Awaited>; +type ShikiCodeHighlighter = Pick; let highlighterPromise: Promise | undefined; export async function createShikiSqlHighlighter(options: ShikiSqlHighlighterOptions): Promise { - const highlighter = await getShikiSqlHighlighter(); - return (content, appearance = options.appearance()) => - highlighter.codeToHtml(content, { - lang: "sql", - structure: "inline", - theme: SHIKI_THEMES[appearance], - }); + try { + const highlighter = await getShikiSqlHighlighter(); + return createSafeSqlHighlighter(highlighter, options); + } catch (error) { + console.warn("[DBX][sqlHighlighter] Failed to initialize SQL highlighter:", error); + return escapeHtml; + } +} + +export function createSafeSqlHighlighter(highlighter: ShikiCodeHighlighter, options: ShikiSqlHighlighterOptions): SqlHighlighter { + return (content, appearance = options.appearance()) => { + try { + return highlighter.codeToHtml(content, { + lang: "sql", + structure: "inline", + theme: SHIKI_THEMES[appearance], + }); + } catch (error) { + console.warn("[DBX][sqlHighlighter] Failed to highlight SQL:", error); + return escapeHtml(content); + } + }; +} + +export function escapeHtml(content: string): string { + return content.replace(/[&<>"']/g, (char) => { + switch (char) { + case "&": + return "&"; + case "<": + return "<"; + case ">": + return ">"; + case '"': + return """; + default: + return "'"; + } + }); } function getShikiSqlHighlighter(): Promise {