parse nested items correctly

Author: sokra

lib/parseValues.js

@@ -56,6 +56,40 @@ function itemMatch(match) {
 	});
 }
 
+function nestedItemMatch(match, name, spacing) {
+	this.stack.push(this.root);
+	this.root = {
+		type: "nested-item",
+		name: name,
+		nodes: [
+			{ type: "value", nodes: [] }
+		]
+	};
+	if(spacing) {
+		this.root.nodes[0].before = spacing;
+	}
+	this.value.nodes.push(this.root);
+	this.value = this.root.nodes[0];
+}
+
+function nestedItemEndMatch(match, spacing, remaining) {
+	if(this.stack.length === 0) {
+		if(spacing) {
+			var item = this.value.nodes[this.value.nodes.length - 1];
+			item.after = (item.after || "") + spacing;
+		}
+		this.value.nodes.push({
+			type: "invalid",
+			value: remaining
+		});
+	} else {
+		if(spacing) {
+			this.value.after = spacing;
+		}
+		this.root = this.stack.pop();
+	}
+}
+
 function urlMatch(match, innerSpacingBefore, content, innerSpacingAfter) {
 	var item = {
 		type: "url"
@@ -91,10 +125,12 @@ var parser = new Parser({
 		"url\\((\\s*)(\"(?:[^\\\\\"]|\\\\.)*\")(\\s*)\\)": urlMatch,
 		"url\\((\\s*)('(?:[^\\\\']|\\\\.)*')(\\s*)\\)": urlMatch,
 		"url\\((\\s*)((?:[^\\\\)'\"]|\\\\.)*)(\\s*)\\)": urlMatch,
+		"(\\w+)\\((\\s*)": nestedItemMatch,
+		"(\\s*)(\\))": nestedItemEndMatch,
 		",(\\s*)": commaMatch,
 		"\\s+$": endSpacingMatch,
 		"\\s+": spacingMatch,
-		"[^\\s,]+": itemMatch
+		"[^\\s,\)]+": itemMatch
 	}
 });
 
@@ -110,6 +146,7 @@ function parseValues(str) {
 		]
 	};
 	parser.parse("decl", str, {
+		stack: [],
 		root: rootNode,
 		value: valueNode
 	});

lib/stringifyValues.js

@@ -10,6 +10,10 @@ function stringifyWithoutBeforeAfter(tree) {
 		return tree.nodes.map(stringify).join("");
 	case "item":
 		return tree.name;
+	case "nested-item":
+		return tree.name + "(" + tree.nodes.map(stringify).join(",") + ")";
+	case "invalid":
+		return tree.value;
 	case "comment":
 		return "/*" + tree.content + "*/";
 	case "string":

test/test-cases-values.js

@@ -68,6 +68,50 @@ module.exports = {
 			{ type: "url", url: "ghi)j\"k", innerSpacingBefore: " " }
 		])
 	],
+	"nested-item": [
+		"format('woff')",
+		singleValue([
+			{ type: "nested-item", name: "format", nodes: [
+				{ type: "value", nodes: [
+					{ type: "string", stringType: "'", value: "woff"}
+				]}
+			] }
+		])
+	],
+	"nested-item-difficult": [
+		"format('woff'), format( \"a b, c\" )",
+		{
+			type: "values",
+			nodes: [
+				{ type: "value", nodes: [
+					{ type: "nested-item", name: "format", nodes: [
+						{ type: "value", nodes: [
+							{ type: "string", stringType: "'", value: "woff"}
+						]}
+					] }
+				] },
+				{ type: "value", nodes: [
+					{ type: "nested-item", name: "format", nodes: [
+						{ type: "value", nodes: [
+							{ type: "string", stringType: "\"", value: "a b, c"}
+						], before: " ", after: " " }
+					] }
+				], before: " " }
+			]
+		}
+	],
+	"invalid": [
+		" ) ) ",
+		{
+			type: "values",
+			nodes: [
+				{ type: "value", nodes: [
+					{ type: "invalid", value: ")", after: " " },
+					{ type: "invalid", value: ")" }
+				], before: " ", after: " " }
+			]
+		}
+	],
 	"spacing": [
 		"   hello\n\t world\t",
 		{