From 76660a3b367f38ed554d32ec20dbe7a1fd39f470 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 4 Jul 2025 19:21:01 +0900 Subject: refactor(blog/nuldoc): refactor DOM-related code --- services/blog/nuldoc-src/renderers/xml.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'services/blog/nuldoc-src/renderers/xml.ts') diff --git a/services/blog/nuldoc-src/renderers/xml.ts b/services/blog/nuldoc-src/renderers/xml.ts index 77cc1574..523567ab 100644 --- a/services/blog/nuldoc-src/renderers/xml.ts +++ b/services/blog/nuldoc-src/renderers/xml.ts @@ -24,7 +24,7 @@ function getDtd(name: string): Dtd { } function isInlineNode(n: Node): boolean { - if (n.kind === "text") { + if (n.kind === "text" || n.kind === "raw") { return true; } return getDtd(n.name).type === "inline"; @@ -36,11 +36,9 @@ function isBlockNode(n: Node): boolean { function nodeToXmlText(n: Node, ctx: Context): string { if (n.kind === "text") { - if (n.raw) { - return n.content; - } else { - return textNodeToXmlText(n); - } + return textNodeToXmlText(n); + } else if (n.kind === "raw") { + return n.html; } else { return elementNodeToXmlText(n, ctx); } @@ -102,8 +100,8 @@ function indent(ctx: Context): string { } function getElementAttributes(e: Element): [string, string][] { - return [...e.attributes.entries()] - .filter((a) => !a[0].startsWith("--")) + return [...Object.entries(e.attributes)] + .filter((a) => !a[0].startsWith("__")) .sort( (a, b) => { // Special rules: -- cgit v1.2.3-70-g09d2