simplify xml generator and support self-closing tags

Author: g-harel

internal/xml/index.ts

@@ -1,41 +1,26 @@
-// Generic XML element. None of the implementations' output is sanitized.
-export interface IElement {
+// Generic XML element.
+export interface IXml {
     render(): string;
 }
 
-// Unstructured element that will render as the provided string.
-export class RawElement implements IElement {
-    public text: string;
-
-    public constructor(text: string) {
-        this.text = text;
-    }
-
-    public render(): string {
-        return this.text;
-    }
-}
-
 // Structured element with tag, attributes and children.
-export class Element implements IElement {
+export class Xml implements IXml {
     public tag: string;
     public attributes: Record<string, string | number>;
-    public children: IElement[];
+    public children: IXml[];
 
-    public constructor(tag: string, attributes?: Element["attributes"]) {
+    public constructor(tag: string, attributes?: Xml["attributes"]) {
         this.tag = tag;
         this.attributes = attributes || {};
         this.children = [];
     }
 
-    public add(child: IElement): Element {
-        this.children.push(child);
-        return this;
-    }
-
     public render(): string {
         const attributes = this.renderAttributes();
         const content = this.renderChildren();
+        if (content === "") {
+            return `<${this.tag}${attributes}/>`;
+        }
         return `<${this.tag}${attributes}>${content}</${this.tag}>`;
     }
 

internal/xml/test.ts

@@ -1,30 +1,26 @@
-import {Element, RawElement} from ".";
+import {Xml} from ".";
 
 describe("internal/xml/xml", () => {
     describe("render", () => {
-        it("should render raw elements", () => {
-            const elem = new RawElement("test");
-            expect(elem.render()).toBe("test");
-        });
-
         it("should render element tags", () => {
-            const elem = new Element("test");
-            expect(elem.render()).toBe("<test></test>");
+            const elem = new Xml("test");
+            expect(elem.render()).toBe("<test/>");
         });
 
         it("should render element attributes", () => {
-            const elem = new Element("test", {a: 1, "b-c": "d"});
-            expect(elem.render()).toBe('<test a="1" b-c="d"></test>');
+            const elem = new Xml("test", {a: 1, "b-c": "d"});
+            expect(elem.render()).toBe('<test a="1" b-c="d"/>');
         });
 
-        it("should render element children", () => {
-            const a = new Element("a");
-            const aa = new Element("aa");
-            const ab = new Element("ab");
-            const aba = new RawElement("aba");
-            a.add(aa).add(ab);
-            ab.add(aba);
-            expect(a.render()).toBe('<a><aa></aa><ab>aba</ab></a>');
+        it("should render nested elements", () => {
+            const a = new Xml("a");
+            const aa = new Xml("aa");
+            const ab = new Xml("ab");
+            const aba = {render: () => "aba"};
+            a.children.push(aa);
+            a.children.push(ab);
+            ab.children.push(aba);
+            expect(a.render()).toBe("<a><aa/><ab>aba</ab></a>");
         });
     });
 });