Fix:避免 SQL 预览高亮失败导致白屏

This commit is contained in:
zipg authored and GitHub committed 2026-06-29 11:14:59 +08:00
1 parent 6e1b49bc34
commit b29fd75e99
2 files changed
+67 -7

No files matched your search

@@ -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 '<tag>' AS "name" & col`)).toBe("SELECT &#39;&lt;tag&gt;&#39; AS &quot;name&quot; &amp; 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 "<x>" INT;`)).toBe("ALTER TABLE t ADD &quot;&lt;x&gt;&quot; INT;");
expect(warn).toHaveBeenCalledOnce();
warn.mockRestore();
});
});
+40 -7
View File
@@ -12,17 +12,50 @@ const SHIKI_THEMES = {
} as const; } as const;
type ShikiHighlighter = Awaited<ReturnType<typeof import("shiki/core").createHighlighterCore>>; type ShikiHighlighter = Awaited<ReturnType<typeof import("shiki/core").createHighlighterCore>>;
type ShikiCodeHighlighter = Pick<ShikiHighlighter, "codeToHtml">;
let highlighterPromise: Promise<ShikiHighlighter> | undefined; let highlighterPromise: Promise<ShikiHighlighter> | undefined;
export async function createShikiSqlHighlighter(options: ShikiSqlHighlighterOptions): Promise<SqlHighlighter> { export async function createShikiSqlHighlighter(options: ShikiSqlHighlighterOptions): Promise<SqlHighlighter> {
const highlighter = await getShikiSqlHighlighter(); try {
return (content, appearance = options.appearance()) => const highlighter = await getShikiSqlHighlighter();
highlighter.codeToHtml(content, { return createSafeSqlHighlighter(highlighter, options);
lang: "sql", } catch (error) {
structure: "inline", console.warn("[DBX][sqlHighlighter] Failed to initialize SQL highlighter:", error);
theme: SHIKI_THEMES[appearance], 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 "&amp;";
case "<":
return "&lt;";
case ">":
return "&gt;";
case '"':
return "&quot;";
default:
return "&#39;";
}
});
} }
function getShikiSqlHighlighter(): Promise<ShikiHighlighter> { function getShikiSqlHighlighter(): Promise<ShikiHighlighter> {