Better matching and escpaing

Author: sokra

lib/parseValues.js

@@ -23,8 +23,12 @@ function endSpacingMatch(match) {
 }
 
 function unescapeString(content) {
-	return content.replace(/\\./g, function(escaped) {
-		return escaped.substr(1);
+	return content.replace(/\\([a-fA-F0-9]{4}|.)/g, function(escaped) {
+		if(escaped.length > 2) {
+			return String.fromCharCode(parseInt(escaped.substr(1), 16));
+		} else {
+			return escaped.substr(1);
+		}
 	});
 }
 
@@ -87,6 +91,7 @@ function nestedItemEndMatch(match, spacing, remaining) {
 			this.value.after = spacing;
 		}
 		this.root = this.stack.pop();
+		this.value = this.root.nodes[this.root.nodes.length - 1];
 	}
 }
 
@@ -125,7 +130,7 @@ var parser = new Parser({
 		"url\\((\\s*)(\"(?:[^\\\\\"]|\\\\.)*\")(\\s*)\\)": urlMatch,
 		"url\\((\\s*)('(?:[^\\\\']|\\\\.)*')(\\s*)\\)": urlMatch,
 		"url\\((\\s*)((?:[^\\\\)'\"]|\\\\.)*)(\\s*)\\)": urlMatch,
-		"(\\w+)\\((\\s*)": nestedItemMatch,
+		"([\\w\-]+)\\((\\s*)": nestedItemMatch,
 		"(\\s*)(\\))": nestedItemEndMatch,
 		",(\\s*)": commaMatch,
 		"\\s+$": endSpacingMatch,

lib/stringifyValues.js

@@ -2,6 +2,27 @@
 
 var stringify;
 
+function escape(str, stringType) {
+	return str.replace(/["'\\\x80-\uFFFF]/g, function(match) {
+		switch(match) {
+		case "\"":
+			if(stringType === "\"") {
+				return "\\\"";
+			}
+			return match;
+		case "'":
+			if(stringType === "'") {
+				return "\\'";
+			}
+			return match;
+		case "\\":
+			return "\\\\";
+		default:
+			return "\\" + (0x10000 + match.charCodeAt(0)).toString(16).substr(1);
+		}
+	});
+}
+
 function stringifyWithoutBeforeAfter(tree) {
 	switch(tree.type) {
 	case "values":
@@ -19,9 +40,9 @@ function stringifyWithoutBeforeAfter(tree) {
 	case "string":
 		switch(tree.stringType) {
 		case "'":
-			return "'" + tree.value.replace(/'/g, "\\'") + "'";
+			return "'" + escape(tree.value, "'") + "'";
 		case "\"":
-			return "\"" + tree.value.replace(/"/g, "\\\"") + "\"";
+			return "\"" + escape(tree.value, "\"") + "\"";
 		}
 		/* istanbul ignore next */
 		throw new Error("Invalid stringType");

test/test-cases-values.js

@@ -123,5 +123,28 @@ module.exports = {
 				], before: "   ", after: "\t" }
 			]
 		}
+	],
+	"escaped unicode": [
+		"'\\f0e3\\\\\\'\"'",
+		singleValue([
+			{ type: "string", stringType: "'", value: "\uf0e3\\'\"" }
+		])
+	],
+	"escaped unicode 2": [
+		"\"\\f0e3\\\\'\\\"\"",
+		singleValue([
+			{ type: "string", stringType: "\"", value: "\uf0e3\\'\"" }
+		])
+	],
+	"nested-item-with append": [
+		"linear-gradient(45deg) 25%",
+		singleValue([
+			{ type: "nested-item", name: "linear-gradient", nodes: [
+				{ type: "value", nodes: [
+					{ type: "item", name: "45deg"}
+				]}
+			], after: " " },
+			{ type: "item", name: "25%" }
+		])
 	]
 };