single-file-core 1.5.77 → 1.5.79

package/modules/css-rules-minifier.js

@@ -28,8 +28,6 @@ import { sanitizeSelector } from "./css-selector-sanitizer.js";
 
 const DEBUG = false;
 
-const CANONICAL_PSEUDO_ELEMENT_NAMES = new Set(["after", "before", "first-letter", "first-line", "placeholder", "selection", "part", "marker"]);
-const DYNAMIC_STATE_PSEUDO_CLASSES = new Set(["hover", "focus", "active", "focus-within", "focus-visible", "target", "visited", "link", "target-current"]);
 const CONDITIONAL_AT_RULE_NAMES = new Set(["media", "supports", "container"]);
 const RULE_TYPE = "Rule";
 const AT_RULE_TYPE = "Atrule";
@@ -289,17 +287,15 @@ function processSelectors(ruleData, processingContext, docContext) {
 	for (let selector = ruleData.prelude.children.head, selectorIndex = 0; selector; selector = selector.next, selectorIndex++) {
 		const {
 			startsWithCombinator,
-			hasPseudoElement,
-			hasDynamicStatePseudoClass,
+			hasPseudo,
 			scopeRelative
 		} = analyzeSelector(selector.data);
 		registerSelector(selector, ruleData, scopeRelative, processingContext, docContext);
-		if (!hasPseudoElement && !hasDynamicStatePseudoClass &&
-			(!startsWithCombinator || !ancestorsSelectors || !ancestorsSelectors.length)) {
+		if (!startsWithCombinator || !ancestorsSelectors || !ancestorsSelectors.length) {
 			const matchedElements = matchElements(selector, ancestorsSelectors, docContext);
-			if (matchedElements.length) {
+			if (matchedElements.length && !hasPseudo) {
 				updateMatchingSelectors(matchedElements, selector, docContext);
-			} else {
+			} else if (!matchedElements.length) {
 				removedSelectors.push(selector);
 			}
 		}
@@ -308,20 +304,16 @@ function processSelectors(ruleData, processingContext, docContext) {
 }
 
 function analyzeSelector(selector) {
-	let hasPseudoElement = false;
-	let hasDynamicStatePseudoClass = false;
+	let hasPseudo = false;
 	let hasNestingOrScope = false;
 	let startsWithCombinator = false;
 	cssTree.walk(selector, {
 		enter(node) {
 			if (node.type === PSEUDO_ELEMENT_SELECTOR_TYPE) {
-				hasPseudoElement = true;
+				hasPseudo = true;
 			} else if (node.type === PSEUDO_CLASS_SELECTOR_TYPE) {
-				if (CANONICAL_PSEUDO_ELEMENT_NAMES.has(node.name)) {
-					hasPseudoElement = true;
-				} else if (DYNAMIC_STATE_PSEUDO_CLASSES.has(node.name)) {
-					hasDynamicStatePseudoClass = true;
-				} else if (node.name === SCOPE_NAME) {
+				hasPseudo = true;
+				if (node.name === SCOPE_NAME) {
 					hasNestingOrScope = true;
 				}
 			} else if (node.type === NESTING_SELECTOR_TYPE) {
@@ -332,7 +324,7 @@ function analyzeSelector(selector) {
 	const firstChild = selector.children.head.data;
 	startsWithCombinator = firstChild && firstChild.type === COMBINATOR_NAME;
 	const scopeRelative = !startsWithCombinator && !hasNestingOrScope;
-	return { hasPseudoElement, hasDynamicStatePseudoClass, startsWithCombinator, scopeRelative };
+	return { hasPseudo, startsWithCombinator, scopeRelative };
 }
 
 function updateMatchingSelectors(matchedElements, selector, docContext) {

package/modules/css-selector-sanitizer.js

@@ -44,7 +44,39 @@ const UNMATCHABLE_PSEUDO_CLASSES = [
     "right",
     "seeking",
     "stalled",
-    "volume-locked"
+    "volume-locked",
+    "after",
+    "before",
+    "visited",
+    "link",
+    "any-link",
+    "local-link",
+    "target",
+    "scope",
+    "hover",
+    "active",
+    "focus",
+    "focus-within",
+    "focus-visible",
+    "target-current",
+    "enabled",
+    "disabled",
+    "read-only",
+    "read-write",
+    "placeholder-shown",
+    "autofill",
+    "default",
+    "checked",
+    "indeterminate",
+    "blank",
+    "valid",
+    "invalid",
+    "in-range",
+    "out-of-range",
+    "required",
+    "optional",
+    "user-valid",
+    "user-invalid"
 ];
 
 export {

package/modules/template-formatter.js

@@ -16951,8 +16951,12 @@ async function evalTemplate(template = "", options, content, doc, context = {})
 			getter: () => {
 				const pathname = url.pathname;
 				const segments = pathname.split("/");
-				const lastSegment = segments[segments.length - 1] || segments[segments.length - 2] || "";
-				return decode(lastSegment);
+				if (pathname.endsWith("/")) {
+					return "";
+				} else {
+					const lastSegment = segments[segments.length - 1];
+					return decode(lastSegment);
+				}
 			}, dontReplaceSlash: dontReplaceSlashIfUndefined
 		},
 		"bookmark-pathname": { getter: () => bookmarkFolder, dontReplaceSlash: dontReplaceSlashIfUndefined },
@@ -17050,7 +17054,7 @@ async function evalTemplate(template = "", options, content, doc, context = {})
 				const utf8Array = base64ToBytes(value);
 				return new TextDecoder("utf-8").decode(utf8Array);
 				// eslint-disable-next-line no-unused-vars
-			} catch(error) {
+			} catch (error) {
 				return value;
 			}
 		},

package/package.json

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