Rich-Harris · TrySound · Jul 9, 2019 · Jul 8, 2019 · Jul 8, 2019 · Jul 8, 2019
diff --git a/src/index.js b/src/index.js
@@ -45,7 +45,7 @@ export function parse(source) {
 		while (i < source.length && source[i] !== '<') text += source[i++];
 
 		if (/\S/.test(text)) {
-			currentElement.children.push(text);
+			currentElement.children.push({ type: 'text', value: text });
 		}
 
 		if (source[i] === '<') {
@@ -68,11 +68,12 @@ export function parse(source) {
 
 		if (char === '/') return closingTag;
 
-		const name = getName();
+		const tagName = getName();
 
 		const element = {
-			name,
-			attributes: {},
+			type: 'element',
+			tagName,
+			properties: {},
 			children: []
 		};
 
@@ -84,7 +85,7 @@ export function parse(source) {
 
 		let attribute;
 		while (i < source.length && (attribute = getAttribute())) {
-			element.attributes[attribute.name] = attribute.value;
+			element.properties[attribute.name] = attribute.value;
 		}
 
 		let selfClosing = false;
@@ -125,12 +126,12 @@ export function parse(source) {
 	}
 
 	function closingTag() {
-		const name = getName();
+		const tagName = getName();
 
-		if (!name) error('Expected tag name');
+		if (!tagName) error('Expected tag name');
 
-		if (name !== currentElement.name) {
-			error(`Expected closing tag </${name}> to match opening tag <${currentElement.name}>`);
+		if (tagName !== currentElement.tagName) {
+			error(`Expected closing tag </${tagName}> to match opening tag <${currentElement.tagName}>`);
 		}
 
 		if (source[i] !== '>') {
@@ -226,6 +227,9 @@ export function parse(source) {
 		error('Unexpected end of input');
 	}
 
-	if (root.name === 'svg') root.metadata = header;
-	return root;
+	if (root.tagName === 'svg') root.metadata = header;
+	return {
+		type: 'root',
+		children: [root]
+	};
 }
diff --git a/test/samples/attribute-with-number/output.json b/test/samples/attribute-with-number/output.json
@@ -1,10 +1,16 @@
 {
-	"name": "line",
-	"attributes": {
-		"x1": 0,
-		"y1": 0,
-		"x2": 10,
-		"y2": 0
-	},
-	"children": []
+	"type": "root",
+	"children": [
+		{
+			"type": "element",
+			"tagName": "line",
+			"properties": {
+				"x1": 0,
+				"y1": 0,
+				"x2": 10,
+				"y2": 0
+			},
+			"children": []
+		}
+	]
 }
diff --git a/test/samples/cdata/output.json b/test/samples/cdata/output.json
@@ -1,19 +1,27 @@
 {
-	"name": "svg",
-	"metadata": "",
-	"attributes": {},
+	"type": "root",
 	"children": [
 		{
-			"name": "defs",
-			"attributes": {},
+			"type": "element",
+			"tagName": "svg",
+			"metadata": "",
+			"properties": {},
 			"children": [
 				{
-					"name": "style",
-					"attributes": {
-						"type": "text/css"
-					},
+					"type": "element",
+					"tagName": "defs",
+					"properties": {},
 					"children": [
-						"\n\t\t\trect {\n\t\t\t\tfill: red;\n\t\t\t\tstroke: blue;\n\t\t\t\tstroke-width: 3\n\t\t\t}\n\t\t\t"
+						{
+							"type": "element",
+							"tagName": "style",
+							"properties": {
+								"type": "text/css"
+							},
+							"children": [
+								"\n\t\t\trect {\n\t\t\t\tfill: red;\n\t\t\t\tstroke: blue;\n\t\t\t\tstroke-width: 3\n\t\t\t}\n\t\t\t"
+							]
+						}
 					]
 				}
 			]

diff --git a/test/samples/children/output.json b/test/samples/children/output.json
@@ -1,16 +1,23 @@
 {
-	"metadata": "",
-	"name": "svg",
-	"attributes": {
-		"xmlns": "http://www.w3.org/2000/svg"
-	},
+	"type": "root",
 	"children": [
 		{
-			"name": "path",
-			"attributes": {
-				"d": "M0,0 L10,0 L10,10 L0,10Z"
+			"type": "element",
+			"metadata": "",
+			"tagName": "svg",
+			"properties": {
+				"xmlns": "http://www.w3.org/2000/svg"
 			},
-			"children": []
+			"children": [
+				{
+					"type": "element",
+					"tagName": "path",
+					"properties": {
+						"d": "M0,0 L10,0 L10,10 L0,10Z"
+					},
+					"children": []
+				}
+			]
 		}
 	]
 }
diff --git a/test/samples/comment/output.json b/test/samples/comment/output.json
@@ -1,5 +1,11 @@
 {
-	"name": "g",
-	"attributes": {},
-	"children": []
+	"type": "root",
+	"children": [
+		{
+			"type": "element",
+			"tagName": "g",
+			"properties": {},
+			"children": []
+		}
+	]
 }
diff --git a/test/samples/consecutive-paths/output.json b/test/samples/consecutive-paths/output.json
@@ -1,33 +1,42 @@
 {
-	"name": "svg",
-	"metadata": "",
-	"attributes": {
-		"viewBox": "0 0 50 10"
-	},
+	"type": "root",
 	"children": [
 		{
-			"name": "path",
-			"attributes": {
-				"d": "M0 0L10 0 10 10 0 10 Z",
-				"fill": "green"
+			"type": "element",
+			"tagName": "svg",
+			"metadata": "",
+			"properties": {
+				"viewBox": "0 0 50 10"
 			},
-			"children": []
-		},
-		{
-			"name": "path",
-			"attributes": {
-				"d": "M20 0L30 0 30 10 20 10 Z",
-				"fill": "blue"
-			},
-			"children": []
-		},
-		{
-			"name": "path",
-			"attributes": {
-				"d": "M40 0L50 0 50 10 40 10 Z",
-				"fill": "red"
-			},
-			"children": []
+			"children": [
+				{
+					"type": "element",
+					"tagName": "path",
+					"properties": {
+						"d": "M0 0L10 0 10 10 0 10 Z",
+						"fill": "green"
+					},
+					"children": []
+				},
+				{
+					"type": "element",
+					"tagName": "path",
+					"properties": {
+						"d": "M20 0L30 0 30 10 20 10 Z",
+						"fill": "blue"
+					},
+					"children": []
+				},
+				{
+					"type": "element",
+					"tagName": "path",
+					"properties": {
+						"d": "M40 0L50 0 50 10 40 10 Z",
+						"fill": "red"
+					},
+					"children": []
+				}
+			]
 		}
 	]
 }
diff --git a/test/samples/doctype/output.json b/test/samples/doctype/output.json
@@ -1,6 +1,12 @@
 {
-	"metadata": "<?xml version=\"1.0\" standalone=\"no\"?>\n<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0  -->\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n",
-	"name": "svg",
-	"attributes": {},
-	"children": []
+	"type": "root",
+	"children": [
+		{
+			"type": "element",
+			"metadata": "<?xml version=\"1.0\" standalone=\"no\"?>\n<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0  -->\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n",
+			"tagName": "svg",
+			"properties": {},
+			"children": []
+		}
+	]
 }
diff --git a/test/samples/double-quoted-attributes/output.json b/test/samples/double-quoted-attributes/output.json
@@ -1,10 +1,16 @@
 {
-	"name": "rect",
-	"attributes": {
-		"x": 0,
-		"y": 0,
-		"width": 100,
-		"height": 100
-	},
-	"children": []
+	"type": "root",
+	"children": [
+		{
+			"type": "element",
+			"tagName": "rect",
+			"properties": {
+				"x": 0,
+				"y": 0,
+				"width": 100,
+				"height": 100
+			},
+			"children": []
+		}
+	]
 }
diff --git a/test/samples/empty-svg/output.json b/test/samples/empty-svg/output.json
@@ -1,6 +1,12 @@
 {
-	"metadata": "",
-	"name": "svg",
-	"attributes": {},
-	"children": []
+	"type": "root",
+	"children": [
+		{
+			"type": "element",
+			"tagName": "svg",
+			"metadata": "",
+			"properties": {},
+			"children": []
+		}
+	]
 }
diff --git a/test/samples/non-self-closing-element/output.json b/test/samples/non-self-closing-element/output.json
@@ -1,7 +1,13 @@
 {
-	"name": "path",
-	"attributes": {
-		"d": "M0,0 L10,0 L10,10 L0,10Z"
-	},
-	"children": []
+	"type": "root",
+	"children": [
+		{
+			"type": "element",
+			"tagName": "path",
+			"properties": {
+				"d": "M0,0 L10,0 L10,10 L0,10Z"
+			},
+			"children": []
+		}
+	]
 }
diff --git a/test/samples/self-closing-element/output.json b/test/samples/self-closing-element/output.json
@@ -1,7 +1,13 @@
 {
-	"name": "path",
-	"attributes": {
-		"d": "M0,0 L10,0 L10,10 L0,10Z"
-	},
-	"children": []
+	"type": "root",
+	"children": [
+		{
+			"type": "element",
+			"tagName": "path",
+			"properties": {
+				"d": "M0,0 L10,0 L10,10 L0,10Z"
+			},
+			"children": []
+		}
+	]
 }
diff --git a/test/samples/single-quoted-attributes/output.json b/test/samples/single-quoted-attributes/output.json
@@ -1,10 +1,16 @@
 {
-	"name": "rect",
-	"attributes": {
-		"x": 0,
-		"y": 0,
-		"width": 100,
-		"height": 100
-	},
-	"children": []
+	"type": "root",
+	"children": [
+		{
+			"type": "element",
+			"tagName": "rect",
+			"properties": {
+				"x": 0,
+				"y": 0,
+				"width": 100,
+				"height": 100
+			},
+			"children": []
+		}
+	]
 }