integrated css-what.js

extension/core/bg/core.js

@@ -31,6 +31,7 @@ singlefile.core = (() => {
 		"/extension/ui/content/content-ui.js",
 		"/lib/single-file/base64.js",
 		"/lib/single-file/uglifycss.js",
+		"/lib/single-file/css-what.js",
 		"/lib/single-file/fonts-minifier.js",
 		"/lib/single-file/rules-minifier.js",
 		"/lib/single-file/htmlmini.js",

lib/single-file/css-what.js

@@ -0,0 +1,364 @@
+/*
+ * Copyright (c) Felix Böhm
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * 
+ * THIS IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// Modified by Gildas Lormeau
+
+this.cssWhat = this.cssWhat || (() => {
+	"use strict";
+
+	const re_name = /^(?:\\.|[\w\-\u00c0-\uFFFF])+/,
+		re_escape = /\\([\da-f]{1,6}\s?|(\s)|.)/ig,
+		//modified version of https://github.com/jquery/sizzle/blob/master/src/sizzle.js#L87
+		re_attr = /^\s*((?:\\.|[\w\u00c0-\uFFFF-])+)\s*(?:(\S?)=\s*(?:(['"])([^]*?)\3|(#?(?:\\.|[\w\u00c0-\uFFFF-])*)|)|)\s*(i)?\]/;
+	const actionTypes = {
+		__proto__: null,
+		"undefined": "exists",
+		"": "equals",
+		"~": "element",
+		"^": "start",
+		"$": "end",
+		"*": "any",
+		"!": "not",
+		"|": "hyphen"
+	};
+	const simpleSelectors = {
+		__proto__: null,
+		">": "child",
+		"~": "sibling",
+		"+": "adjacent"
+	};
+	const attribSelectors = {
+		__proto__: null,
+		"#": ["id", "equals"],
+		".": ["class", "element"]
+	};
+	//pseudos, whose data-property is parsed as well
+	const unpackPseudos = {
+		__proto__: null,
+		"has": true,
+		"not": true,
+		"matches": true
+	};
+	const stripQuotesFromPseudos = {
+		__proto__: null,
+		"contains": true,
+		"icontains": true
+	};
+	const quotes = {
+		__proto__: null,
+		"\"": true,
+		"'": true
+	};
+	const pseudoElements = [
+		"after", "before", "cue", "first-letter", "first-line", "selection", "slotted"
+	];
+	const stringify = (() => {
+		const actionTypes = {
+			"equals": "",
+			"element": "~",
+			"start": "^",
+			"end": "$",
+			"any": "*",
+			"not": "!",
+			"hyphen": "|"
+		};
+		const simpleSelectors = {
+			__proto__: null,
+			child: " > ",
+			sibling: " ~ ",
+			adjacent: " + ",
+			descendant: " ",
+			universal: "*"
+		};
+		function stringify(token) {
+			return token.map(stringifySubselector).join(", ");
+		}
+		function stringifySubselector(token) {
+			return token.map(stringifyToken).join("");
+		}
+		function stringifyToken(token) {
+			if (token.type in simpleSelectors) return simpleSelectors[token.type];
+			if (token.type == "tag") return escapeName(token.name);
+			if (token.type == "attribute") {
+				if (token.action == "exists") return "[" + escapeName(token.name) + "]";
+				if (token.expandedSelector && token.name == "id" && token.action == "equals" && !token.ignoreCase) return "#" + escapeName(token.value);
+				if (token.expandedSelector && token.name == "class" && token.action == "element" && !token.ignoreCase) return "." + escapeName(token.value);
+				return "[" +
+					escapeName(token.name) + actionTypes[token.action] + "=\"" +
+					escapeName(token.value) + "\"" + (token.ignoreCase ? "i" : "") + "]";
+			}
+			if (token.type == "pseudo") {
+				if (token.data == null) return ":" + escapeName(token.name);
+				if (typeof token.data == "string") return ":" + escapeName(token.name) + "(" + token.data + ")";
+				return ":" + escapeName(token.name) + "(" + stringify(token.data) + ")";
+			}
+			if (token.type == "pseudo-element") {
+				return "::" + escapeName(token.name);
+			}
+		}
+		function escapeName(str) {
+			return cssEscape(str).output;
+		}
+		return stringify;
+	})();
+
+	return {
+		parse,
+		stringify
+	};
+
+	// cssEscape taken from https://mathiasbynens.be/notes/css-escapes
+	function cssEscape(string, escapeNonASCII) {
+		// Based on `ucs2decode` from https://mths.be/punycode
+		const firstChar = string.charAt(0);
+		let output = "";
+		let counter = 0;
+		const length = string.length;
+		let value;
+		let character;
+		let charCode;
+		let surrogatePairCount = 0;
+		let extraCharCode; // low surrogate
+		while (counter < length) {
+			character = string.charAt(counter++);
+			charCode = character.charCodeAt();
+			// if it’s a non-ASCII character and those need to be escaped
+			if (escapeNonASCII && (charCode < 0x20 || charCode > 0x7E)) {
+				if ((charCode & 0xF800) == 0xD800) {
+					surrogatePairCount++;
+					extraCharCode = string.charCodeAt(counter++);
+					if ((charCode & 0xFC00) != 0xD800 || (extraCharCode & 0xFC00) != 0xDC00) {
+						throw Error("UCS-2(decode): illegal sequence");
+					}
+					charCode = ((charCode & 0x3FF) << 10) + (extraCharCode & 0x3FF) + 0x10000;
+				}
+				value = "\\" + charCode.toString(16).toUpperCase() + " ";
+			} else {
+				// `\r` is already tokenized away at this point by the HTML parser.
+				// `:` can be escaped as `\:`, but that fails in IE < 8.
+				if (/[\t\n\v\f:]/.test(character)) {
+					value = "\\" + charCode.toString(16).toUpperCase() + " ";
+				} else if (/[ !"#$%&'()*+,./;<=>?@[\\\]^`{|}~]/.test(character)) {
+					value = "\\" + character;
+				} else {
+					value = character;
+				}
+			}
+			output += value;
+		}
+		if (/^_/.test(output)) { // Prevent IE6 from ignoring the rule altogether.
+			output = "\\_" + output.slice(1);
+		}
+		if (/^-[\d]/.test(output)) {
+			output = "\\-" + output.slice(1);
+		}
+		if (/\d/.test(firstChar)) {
+			output = "\\3" + firstChar + " " + output.slice(1);
+		}
+		return {
+			"surrogatePairCount": surrogatePairCount,
+			"output": output
+		};
+	}
+
+	// unescape function taken from https://github.com/jquery/sizzle/blob/master/src/sizzle.js#L139
+	function funescape(_, escaped, escapedWhitespace) {
+		const high = "0x" + escaped - 0x10000;
+		// NaN means non-codepoint
+		// Support: Firefox
+		// Workaround erroneous numeric interpretation of +"0x"
+		return high != high || escapedWhitespace ?
+			escaped :
+			// BMP codepoint
+			high < 0 ?
+				String.fromCharCode(high + 0x10000) :
+				// Supplemental Plane codepoint (surrogate pair)
+				String.fromCharCode(high >> 10 | 0xD800, high & 0x3FF | 0xDC00);
+	}
+
+	function unescapeCSS(str) {
+		return str.replace(re_escape, funescape);
+	}
+
+	function isWhitespace(c) {
+		return c == " " || c == "\n" || c == "\t" || c == "\f" || c == "\r";
+	}
+
+	function parse(selector, options) {
+		const subselects = [];
+		selector = parseSelector(subselects, selector + "", options);
+		if (selector != "") {
+			throw new SyntaxError("Unmatched selector: " + selector);
+		}
+		return subselects;
+	}
+
+	function parseSelector(subselects, selector, options) {
+		let tokens = [];
+		let sawWS = false;
+		let data, firstChar, name, quot;
+		stripWhitespace(0);
+		while (selector != "") {
+			firstChar = selector.charAt(0);
+			if (isWhitespace(firstChar)) {
+				sawWS = true;
+				stripWhitespace(1);
+			} else if (firstChar in simpleSelectors) {
+				tokens.push({ type: simpleSelectors[firstChar] });
+				sawWS = false;
+				stripWhitespace(1);
+			} else if (firstChar == ",") {
+				if (tokens.length == 0) {
+					throw new SyntaxError("empty sub-selector");
+				}
+				subselects.push(tokens);
+				tokens = [];
+				sawWS = false;
+				stripWhitespace(1);
+			} else {
+				if (sawWS) {
+					if (tokens.length > 0) {
+						tokens.push({ type: "descendant" });
+					}
+					sawWS = false;
+				}
+				if (firstChar == "*") {
+					selector = selector.substr(1);
+					tokens.push({ type: "universal" });
+				} else if (firstChar in attribSelectors) {
+					selector = selector.substr(1);
+					tokens.push({
+						expandedSelector: true,
+						type: "attribute",
+						name: attribSelectors[firstChar][0],
+						action: attribSelectors[firstChar][1],
+						value: getName(),
+						ignoreCase: false
+					});
+				} else if (firstChar == "[") {
+					selector = selector.substr(1);
+					data = selector.match(re_attr);
+					if (!data) {
+						throw new SyntaxError("Malformed attribute selector: " + selector);
+					}
+					selector = selector.substr(data[0].length);
+					name = unescapeCSS(data[1]);
+					if (
+						!options || (
+							"lowerCaseAttributeNames" in options ?
+								options.lowerCaseAttributeNames :
+								!options.xmlMode
+						)
+					) {
+						name = name.toLowerCase();
+					}
+					tokens.push({
+						type: "attribute",
+						name: name,
+						action: actionTypes[data[2]],
+						value: unescapeCSS(data[4] || data[5] || ""),
+						ignoreCase: !!data[6]
+					});
+				} else if (firstChar == ":") {
+					if (selector.charAt(1) == ":") {
+						selector = selector.substr(2);
+						tokens.push({ type: "pseudo-element", name: getName().toLowerCase() });
+						continue;
+					}
+					selector = selector.substr(1);
+					name = getName().toLowerCase();
+					data = null;
+					if (selector.charAt(0) == "(") {
+						if (name in unpackPseudos) {
+							quot = selector.charAt(1);
+							const quoted = quot in quotes;
+							selector = selector.substr(quoted + 1);
+							data = [];
+							selector = parseSelector(data, selector, options);
+							if (quoted) {
+								if (selector.charAt(0) != quot) {
+									throw new SyntaxError("unmatched quotes in :" + name);
+								} else {
+									selector = selector.substr(1);
+								}
+							}
+							if (selector.charAt(0) != ")") {
+								throw new SyntaxError("missing closing parenthesis in :" + name + " " + selector);
+							}
+							selector = selector.substr(1);
+						} else {
+							let pos = 1, counter = 1;
+							for (; counter > 0 && pos < selector.length; pos++) {
+								if (selector.charAt(pos) == "(" && !isEscaped(pos)) counter++;
+								else if (selector.charAt(pos) == ")" && !isEscaped(pos)) counter--;
+							}
+							if (counter) {
+								throw new SyntaxError("parenthesis not matched");
+							}
+							data = selector.substr(1, pos - 2);
+							selector = selector.substr(pos);
+							if (name in stripQuotesFromPseudos) {
+								quot = data.charAt(0);
+								if (quot == data.slice(-1) && quot in quotes) {
+									data = data.slice(1, -1);
+								}
+								data = unescapeCSS(data);
+							}
+						}
+					}
+					tokens.push({ type: pseudoElements.indexOf(name) == -1 ? "pseudo" : "pseudo-element", name: name, data: data });
+				} else if (re_name.test(selector)) {
+					name = getName();
+					if (!options || ("lowerCaseTags" in options ? options.lowerCaseTags : !options.xmlMode)) {
+						name = name.toLowerCase();
+					}
+					tokens.push({ type: "tag", name: name });
+				} else {
+					if (tokens.length && tokens[tokens.length - 1].type == "descendant") {
+						tokens.pop();
+					}
+					addToken(subselects, tokens);
+					return selector;
+				}
+			}
+		}
+		addToken(subselects, tokens);
+		return selector;
+
+		function getName() {
+			const sub = selector.match(re_name)[0];
+			selector = selector.substr(sub.length);
+			return unescapeCSS(sub);
+		}
+
+		function stripWhitespace(start) {
+			while (isWhitespace(selector.charAt(start))) start++;
+			selector = selector.substr(start);
+		}
+
+		function isEscaped(pos) {
+			let slashCount = 0;
+			while (selector.charAt(--pos) == "\\") slashCount++;
+			return (slashCount & 1) == 1;
+		}
+	}
+
+	function addToken(subselects, tokens) {
+		if (subselects.length > 0 && tokens.length == 0) {
+			throw new SyntaxError("empty sub-selector");
+		}
+		subselects.push(tokens);
+	}
+
+})();

lib/single-file/rules-minifier.js

@@ -18,12 +18,10 @@
  *   along with SingleFile.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* global CSSRule */
+/* global CSSRule, cssWhat */
 
 this.rulesMinifier = this.rulesMinifier || (() => {
 
-	const REGEXP_PSEUDO_CLASSES = /::after|::before|::first-line|::first-letter|:focus|:focus-within|:hover|:link|:visited|:active/gi;
-
 	return {
 		process: doc => {
 			const selectorsData = new Set();
@@ -72,24 +70,38 @@ this.rulesMinifier = this.rulesMinifier || (() => {
 	}
 
 	function getFilteredSelector(selector) {
-		if (selector.match(REGEXP_PSEUDO_CLASSES)) {
-			let selectors = selector.split(/\s*,\s*/g);
-			selector = selectors.map(selector => {
-				const simpleSelectors = selector.split(/\s*[ >~+]\s*/g);
-				const separators = selector.match(/\s*[ >~+]\s*/g);
-				return simpleSelectors.map((selector, selectorIndex) => {
-					while (selector.match(REGEXP_PSEUDO_CLASSES)) {
-						selector = selector.replace(REGEXP_PSEUDO_CLASSES, "").trim();
+		const SEPARATOR_TYPES = ["descendant", "child", "sibling", "adjacent"];
+		const REMOVED_PSEUDO_CLASSES = ["focus", "focus-within", "hover", "link", "visited", "active"];
+		const REMOVED_PSEUDO_ELEMENTS = ["after", "before", "first-line", "first-letter"];
+
+		const selectors = cssWhat.parse(selector);
+		return cssWhat.stringify(selectors.map(selector => filterPseudoClasses(selector)));
+
+		function filterPseudoClasses(selector) {
+			const tokens = selector.filter(token => {
+				if (token.data) {
+					if (Array.isArray(token.data)) {
+						token.data = token.data.map(selector => filterPseudoClasses(selector));
 					}
-					selector = selector.replace(/:?:[^(]+\(\)/g, "");
-					if (selector == "") {
-						selector = "*";
+				}
+				const test = ((token.type != "pseudo" || !REMOVED_PSEUDO_CLASSES.includes(token.name))
+					&& (token.type != "pseudo-element" || !REMOVED_PSEUDO_ELEMENTS.includes(token.name)));
+				return test;
+			});
+			let insertedTokens = 0;
+			tokens.forEach((token, index) => {
+				if (SEPARATOR_TYPES.includes(token.type)) {
+					if (!tokens[index - 1] || SEPARATOR_TYPES.includes(tokens[index - 1].type)) {
+						tokens.splice(index + insertedTokens, 0, { type: "universal" });
+						insertedTokens++;
 					}
-					return selector + (separators && separators[selectorIndex] ? separators[selectorIndex] : "");
-				}).join("");
-			}).join(",");
+				}
+			});
+			if (!tokens.length || SEPARATOR_TYPES.includes(tokens[tokens.length - 1].type)) {
+				tokens.push({ type: "universal" });
+			}
+			return tokens;
 		}
-		return selector;
 	}
 
 })();

manifest.json

@@ -53,6 +53,7 @@
 			"lib/single-file/doc-helper.js",
 			"lib/single-file/base64.js",
 			"lib/single-file/uglifycss.js",
+			"lib/single-file/css-what.js",
 			"lib/single-file/fonts-minifier.js",
 			"lib/single-file/rules-minifier.js",
 			"lib/single-file/htmlmini.js",