refactor(blog/nuldoc): refactor DOM-related code

2 files changed, 12 insertions, 16 deletions

diff --git a/services/blog/nuldoc-src/renderers/html.ts b/services/blog/nuldoc-src/renderers/html.ts
index 84b3ebaa..6e829f09 100644
--- a/services/blog/nuldoc-src/renderers/html.ts
+++ b/services/blog/nuldoc-src/renderers/html.ts
@@ -127,7 +127,7 @@ function getDtd(name: string): Dtd {
 }
 
 function isInlineNode(n: Node): boolean {
-  if (n.kind === "text") {
+  if (n.kind === "text" || n.kind === "raw") {
     return true;
   }
   if (n.name !== "a") {
@@ -146,11 +146,9 @@ function isBlockNode(n: Node): boolean {
 
 function nodeToHtmlText(n: Node, ctx: Context): string {
   if (n.kind === "text") {
-    if (n.raw) {
-      return n.content;
-    } else {
-      return textNodeToHtmlText(n, ctx);
-    }
+    return textNodeToHtmlText(n, ctx);
+  } else if (n.kind === "raw") {
+    return n.html;
   } else {
     return elementNodeToHtmlText(n, ctx);
   }
@@ -259,8 +257,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("__"))
     .filter((a) => a[1] !== undefined)
     .sort(
       (a, b) => {
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: