single-file-core 1.0.58 → 1.0.60

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.58",
+  "version": "1.0.60",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",

package/single-file-core.js

@@ -1075,6 +1075,7 @@ class Processor {
 				if (options.compressCSS) {
 					ProcessorHelper.removeSingleLineCssComments(stylesheet);
 				}
+				ProcessorHelper.replacePseudoClassDefined(stylesheet);
 				stylesheetInfo.stylesheet = stylesheet;
 			} else {
 				stylesheets.delete(element);
@@ -1534,6 +1535,40 @@ class ProcessorHelper {
 		}
 	}
 
+	static replacePseudoClassDefined(stylesheet) {
+		const removedSelectors = [];
+		if (stylesheet.children) {
+			for (let cssRule = stylesheet.children.head; cssRule; cssRule = cssRule.next) {
+				const ruleData = cssRule.data;
+				if (ruleData.type == "Rule" && ruleData.prelude && ruleData.prelude.children) {
+					for (let selector = ruleData.prelude.children.head; selector; selector = selector.next) {
+						replacePseudoDefinedSelector(selector, ruleData.prelude);
+					}
+				}
+			}
+		}
+		if (removedSelectors.length) {
+			removedSelectors.forEach(({ parentSelector, selector }) => {
+				if (parentSelector.data.children.size == 0 || !selector.prev || selector.prev.data.type == "Combinator" || selector.prev.data.type == "WhiteSpace") {
+					parentSelector.data.children.replace(selector, cssTree.parse("*", { context: "selector" }).children.head);
+				} else {
+					parentSelector.data.children.remove(selector);
+				}
+			});
+		}
+
+		function replacePseudoDefinedSelector(selector, parentSelector) {
+			if (selector.data.children) {
+				for (let childSelector = selector.data.children.head; childSelector; childSelector = childSelector.next) {
+					replacePseudoDefinedSelector(childSelector, selector);
+				}
+			}
+			if (selector.data.type == "PseudoClassSelector" && selector.data.name == "defined") {
+				removedSelectors.push({ parentSelector, selector });
+			}
+		}
+	}
+
 	static async resolveImportURLs(stylesheet, baseURI, options, workStylesheet, importedStyleSheets = new Set()) {
 		let importFound;
 		ProcessorHelper.resolveStylesheetURLs(stylesheet, baseURI, workStylesheet);
@@ -1560,6 +1595,9 @@ class ProcessorHelper {
 						if (mediaQueryListNode) {
 							content.data = wrapMediaQuery(content.data, cssTree.generate(mediaQueryListNode));
 						}
+
+						content.data = content.data.replace(/:defined/gi, "*");
+
 						const importedStylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 						const ancestorStyleSheets = new Set(importedStyleSheets);
 						ancestorStyleSheets.add(resourceURL);
@@ -1665,6 +1703,9 @@ class ProcessorHelper {
 			if (content.data && content.data.match(/^<!doctype /i)) {
 				content.data = "";
 			}
+
+			content.data = content.data.replace(/:defined/gi, "*");
+
 			let stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 			const importFound = await ProcessorHelper.resolveImportURLs(stylesheet, resourceURL, options, workStylesheet);
 			if (importFound) {