fixes issues with escaping of chars

fixes webpack-contrib/css-loader#87
fixes #5

Author: sokra

lib/parseValues.js

@@ -23,9 +23,15 @@ function endSpacingMatch(match) {
 }
 
 function unescapeString(content) {
-	return content.replace(/\\([a-fA-F0-9]{4}|.)/g, function(escaped) {
+	return content.replace(/\\([a-fA-F0-9]{2,5}|.)/g, function(escaped) {
 		if(escaped.length > 2) {
-			return String.fromCharCode(parseInt(escaped.substr(1), 16));
+			var C = parseInt(escaped.substr(1), 16);
+			if(C < 0x10000) {
+				return String.fromCharCode(C);
+			} else {
+				return String.fromCharCode(Math.floor((C - 0x10000) / 0x400) + 0xD800) +
+					String.fromCharCode((C - 0x10000) % 0x400 + 0xDC00);
+			}
 		} else {
 			return escaped.substr(1);
 		}

lib/stringifyValues.js

@@ -1,25 +1,12 @@
 "use strict";
 
+var cssesc = require("cssesc");
+
 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);
-		}
+	return cssesc(str, {
+		quotes: stringType === "\"" ? "double" : "single"
 	});
 }
 

package.json

@@ -31,6 +31,7 @@
   },
   "homepage": "https://github.com/css-modules/css-selector-tokenizer",
   "dependencies": {
+    "cssesc": "^0.1.0",
     "fastparse": "^1.1.1"
   },
   "devDependencies": {

test/test-cases-values.js

@@ -125,17 +125,29 @@ module.exports = {
 		}
 	],
 	"escaped unicode": [
-		"'\\f0e3\\\\\\'\"'",
+		"'\\F0E3\\\\\\'\"'",
 		singleValue([
 			{ type: "string", stringType: "'", value: "\uf0e3\\'\"" }
 		])
 	],
 	"escaped unicode 2": [
-		"\"\\f0e3\\\\'\\\"\"",
+		"\"\\F0E3\\\\'\\\"\"",
 		singleValue([
 			{ type: "string", stringType: "\"", value: "\uf0e3\\'\"" }
 		])
 	],
+	"escaped unicode 3 (short)": [
+		"\"\\10\"",
+		singleValue([
+			{ type: "string", stringType: "\"", value: "\u0010" }
+		])
+	],
+	"escaped unicode 4 (surrogate pair)": [
+		"\"\\1F50E\"",
+		singleValue([
+			{ type: "string", stringType: "\"", value: "\ud83d\udd0e" }
+		])
+	],
 	"nested-item-with append": [
 		"linear-gradient(45deg) 25%",
 		singleValue([