single-file-core 1.0.59 → 1.0.61

package/modules/css-matched-rules.js

@@ -174,12 +174,13 @@ function getMatchedElementsSelector(doc, selectorInfo, styles, matchedElementsCa
 }
 
 function getFilteredSelector(selector, selectorText) {
-	const namespaceSeparatorIndex = selectorText.lastIndexOf("|");
-	if (namespaceSeparatorIndex > -1) {
-		return selectorText.substring(namespaceSeparatorIndex + 1);
-	}
 	const removedSelectors = [];
+	let namespaceFound;
 	selector = { data: cssTree.parse(cssTree.generate(selector.data), { context: "selector" }) };
+	filterNamespace(selector);
+	if (namespaceFound)	{
+		selectorText = cssTree.generate(selector.data).trim();
+	}
 	filterPseudoClasses(selector);
 	if (removedSelectors.length) {
 		removedSelectors.forEach(({ parentSelector, selector }) => {
@@ -205,6 +206,18 @@ function getFilteredSelector(selector, selectorText) {
 		}
 	}
 
+	function filterNamespace(selector) {
+		if (selector.data.children) {
+			for (let childSelector = selector.data.children.head; childSelector; childSelector = childSelector.next) {
+				filterNamespace(childSelector);
+			}
+		}
+		if (selector.data.type == "TypeSelector" && selector.data.name.includes("|")) {
+			namespaceFound = true;
+			selector.data.name = selector.data.name.substring(selector.data.name.lastIndexOf("|") + 1);
+		}
+	}
+
 	function testVendorPseudo(selector) {
 		const name = selector.data.name;
 		return name.startsWith("-") || name.startsWith("\\-");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.0.59",
+  "version": "1.0.61",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",

package/vendor/css-font-property-parser.js

@@ -172,12 +172,19 @@ function parse(value) {
 				throw error("Missing required font-family.");
 			}
 			font.family = [];
-			for (; tokenNode; tokenNode = tokenNode.next) {
+			let familyName = "";
+			while (tokenNode) {
 				while (tokenNode && tokenNode.data.type == "Operator" && tokenNode.data.value == ",") {
 					tokenNode = tokenNode.next;
 				}
-				if (tokenNode) {
-					font.family.push(removeQuotes(cssTree.generate(tokenNode.data)));
+				while (tokenNode && tokenNode.data.type == "Identifier") {
+					familyName += " " + removeQuotes(cssTree.generate(tokenNode.data));
+					tokenNode = tokenNode.next;
+				}
+				familyName = familyName.trim();
+				if (familyName) {
+					font.family.push(familyName);
+					familyName = "";
 				}
 			}
 			return font;