fix: All elements should have type: tag in xmlMode

fb55 · Apr 1, 2021 · 3977aab · 3977aab
1 parent c3e1e2b
commit 3977aab
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 12 deletions.
diff --git a/src/__fixtures__/23-dom-lvl1.json b/src/__fixtures__/23-dom-lvl1.json
@@ -1,6 +1,6 @@
 {
     "name": "DOM level 1",
-    "options": { "withDomLvl1": true },
+    "options": {},
     "html": "<div>some stray text<h1>Hello, world.</h1><!-- comment node -->more stray text</div>",
     "expected": [
         {

diff --git a/src/__fixtures__/27-xml-no-special-tags.json b/src/__fixtures__/27-xml-no-special-tags.json
@@ -0,0 +1,29 @@
+{
+    "name": "XML mode: All tags should have `type: tag`",
+    "options": {
+        "xmlMode": true
+    },
+    "html": "<script><style><div>",
+    "expected": [
+        {
+            "type": "tag",
+            "name": "script",
+            "attribs": {},
+            "children": [
+                {
+                    "type": "tag",
+                    "name": "style",
+                    "attribs": {},
+                    "children": [
+                        {
+                            "type": "tag",
+                            "name": "div",
+                            "attribs": {},
+                            "children": []
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/src/index.ts b/src/index.ts
@@ -42,6 +42,13 @@ export interface DomHandlerOptions {
      * @deprecated
      */
     normalizeWhitespace?: boolean;
+
+    /**
+     * Treat the markup as XML.
+     *
+     * @default false
+     */
+    xmlMode?: boolean;
 }
 
 // Default options
@@ -151,7 +158,8 @@ export class DomHandler {
     }
 
     public onopentag(name: string, attribs: { [key: string]: string }): void {
-        const element = new Element(name, attribs);
+        const type = this.options.xmlMode ? ElementType.Tag : undefined;
+        const element = new Element(name, attribs, undefined, type);
         this.addNode(element);
         this.tagStack.push(element);
     }

diff --git a/src/node.ts b/src/node.ts
@@ -184,17 +184,17 @@ export class Element extends NodeWithChildren {
     constructor(
         public name: string,
         public attribs: { [name: string]: string },
-        children: Node[] = []
+        children: Node[] = [],
+        type:
+            | ElementType.Tag
+            | ElementType.Script
+            | ElementType.Style = name === "script"
+            ? ElementType.Script
+            : name === "style"
+            ? ElementType.Style
+            : ElementType.Tag
     ) {
-        super(
-            name === "script"
-                ? ElementType.Script
-                : name === "style"
-                ? ElementType.Style
-                : ElementType.Tag,
-            children
-        );
-        this.attribs = attribs;
+        super(type, children);
     }
 
     // DOM Level 1 aliases