single-file-core 1.0.57 → 1.0.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.0.57",
+  "version": "1.0.59",
   "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) {

package/single-file.js

@@ -55,10 +55,17 @@ async function getPageData(options = {}, initOptions, doc = globalThis.document,
 		helper.initDoc(doc);
 		const preInitializationPromises = [];
 		if (!options.saveRawPage) {
+			let lazyLoadPromise;
+			if (options.loadDeferredImages) {
+				lazyLoadPromise = processors.lazy.process(options);
+				if (options.loadDeferredImagesBeforeFrames) {
+					await lazyLoadPromise;
+				}
+			}
 			if (!options.removeFrames && frames && globalThis.frames) {
 				let frameTreePromise;
 				if (options.loadDeferredImages) {
-					frameTreePromise = new Promise(resolve => globalThis.setTimeout(() => resolve(frames.getAsync(options)), options.loadDeferredImagesBeforeFrames ? 0 : options.loadDeferredImagesMaxIdleTime * .75));
+					frameTreePromise = new Promise(resolve => globalThis.setTimeout(() => resolve(frames.getAsync(options)), options.loadDeferredImagesBeforeFrames ? 0 : options.loadDeferredImagesMaxIdleTime));
 				} else {
 					frameTreePromise = frames.getAsync(options);
 				}
@@ -68,12 +75,8 @@ async function getPageData(options = {}, initOptions, doc = globalThis.document,
 					preInitializationPromises.push(frameTreePromise);
 				}
 			}
-			if (options.loadDeferredImages) {
-				if (options.loadDeferredImagesBeforeFrames) {
-					await processors.lazy.process(options);
-				} else {
-					preInitializationPromises.push(processors.lazy.process(options));
-				}
+			if (options.loadDeferredImages && !options.loadDeferredImagesBeforeFrames) {
+				preInitializationPromises.push(lazyLoadPromise);
 			}
 		}
 		if (!options.loadDeferredImagesBeforeFrames) {