single-file-core 1.3.8 → 1.3.10

package/core/helper.js

@@ -498,16 +498,18 @@ function getStylesheetsData(doc) {
 		const contents = [];
 		doc.querySelectorAll("style").forEach((styleElement, styleIndex) => {
 			try {
-				const tempStyleElement = doc.createElement("style");
-				tempStyleElement.textContent = styleElement.textContent;
-				doc.body.appendChild(tempStyleElement);
-				const stylesheet = tempStyleElement.sheet;
-				tempStyleElement.remove();
-				const textContentStylesheet = Array.from(stylesheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
-				const sheetStylesheet = Array.from(styleElement.sheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
-				if (!stylesheet || textContentStylesheet != sheetStylesheet) {
-					styleElement.setAttribute(STYLESHEET_ATTRIBUTE_NAME, styleIndex);
-					contents[styleIndex] = Array.from(styleElement.sheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
+				if (!styleElement.sheet.disabled) {
+					const tempStyleElement = doc.createElement("style");
+					tempStyleElement.textContent = styleElement.textContent;
+					doc.body.appendChild(tempStyleElement);
+					const stylesheet = tempStyleElement.sheet;
+					tempStyleElement.remove();
+					const textContentStylesheet = Array.from(stylesheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
+					const sheetStylesheet = Array.from(styleElement.sheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
+					if (!stylesheet || textContentStylesheet != sheetStylesheet) {
+						styleElement.setAttribute(STYLESHEET_ATTRIBUTE_NAME, styleIndex);
+						contents[styleIndex] = Array.from(styleElement.sheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
+					}
 				}
 			} catch (error) {
 				// ignored

package/core/lib/processor-helper.js

@@ -142,10 +142,13 @@ function getProcessorHelperClass(utilInstance) {
 								mediaText = cssTree.generate(mediaQueryListNode);
 							}
 							const existingStylesheet = Array.from(stylesheets).find(([, stylesheetInfo]) => stylesheetInfo.resourceURL == resourceURL);
+							let stylesheet;
 							if (existingStylesheet) {
+								stylesheet = existingStylesheet[1].stylesheet;
 								stylesheets.set({ urlNode }, {
 									url: resourceURL,
-									stylesheet: existingStylesheet[1].stylesheet, scoped
+									stylesheet,
+									scoped
 								});
 							} else {
 								const stylesheetInfo = {
@@ -156,9 +159,11 @@ function getProcessorHelperClass(utilInstance) {
 								stylesheetInfo.url = resourceURL = content.resourceURL;
 								content.data = getUpdatedResourceContent(resourceURL, options) || content.data;
 								stylesheetInfo.stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
+								stylesheet = stylesheetInfo.stylesheet;
 								await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets);
 								stylesheets.set({ urlNode }, stylesheetInfo);
 							}
+							urlNode.importedChildren = stylesheet.children;
 						}
 					}
 				}

package/modules/css-fonts-minifier.js

@@ -100,10 +100,11 @@ function process(doc, stylesheets, styles, options) {
 		}));
 		unusedFonts = fontsInfo.declared.filter(fontInfo => !filteredUsedFonts.has(fontInfo.fontFamily));
 	}
+	const docChars = Array.from(new Set(docContent)).map(char => char.charCodeAt(0)).sort((value1, value2) => value1 - value2);
 	stylesheets.forEach(stylesheetInfo => {
 		const cssRules = stylesheetInfo.stylesheet.children;
 		if (cssRules) {
-			filterUnusedFonts(cssRules, fontsInfo.declared, unusedFonts, filteredUsedFonts, docContent);
+			filterUnusedFonts(cssRules, fontsInfo.declared, unusedFonts, filteredUsedFonts, docChars);
 			stats.rules.discarded -= cssRules.size;
 		}
 	});
@@ -134,17 +135,19 @@ function getFontsInfo(cssRules, fontsInfo, options) {
 	});
 }
 
-function filterUnusedFonts(cssRules, declaredFonts, unusedFonts, filteredUsedFonts, docContent) {
+function filterUnusedFonts(cssRules, declaredFonts, unusedFonts, filteredUsedFonts, docChars) {
 	const removedRules = [];
 	for (let cssRule = cssRules.head; cssRule; cssRule = cssRule.next) {
 		const ruleData = cssRule.data;
-		if (ruleData.type == "Atrule" && (ruleData.name == "media" || ruleData.name == "supports" || ruleData.name == "layer") && ruleData.block && ruleData.block.children) {
-			filterUnusedFonts(ruleData.block.children, declaredFonts, unusedFonts, filteredUsedFonts, docContent);
+		if (ruleData.type == "Atrule" && ruleData.name == "import" && ruleData.prelude && ruleData.prelude.children && ruleData.prelude.children.head.data.importedChildren) {
+			filterUnusedFonts(ruleData.prelude.children.head.data.importedChildren, declaredFonts, unusedFonts, filteredUsedFonts, docChars);
+		} else if (ruleData.type == "Atrule" && (ruleData.name == "media" || ruleData.name == "supports" || ruleData.name == "layer") && ruleData.block && ruleData.block.children) {
+			filterUnusedFonts(ruleData.block.children, declaredFonts, unusedFonts, filteredUsedFonts, docChars);
 		} else if (ruleData.type == "Atrule" && ruleData.name == "font-face") {
 			const fontFamily = helper.normalizeFontFamily(getDeclarationValue(ruleData.block.children, "font-family"));
 			if (fontFamily) {
 				const unicodeRange = getDeclarationValue(ruleData.block.children, "unicode-range");
-				if (unusedFonts.find(fontInfo => fontInfo.fontFamily == fontFamily) || !testUnicodeRange(docContent, unicodeRange) || !testUsedFont(ruleData, fontFamily, declaredFonts, filteredUsedFonts)) {
+				if (unusedFonts.find(fontInfo => fontInfo.fontFamily == fontFamily) || !testUnicodeRange(docChars, unicodeRange) || !testUsedFont(ruleData, fontFamily, declaredFonts, filteredUsedFonts)) {
 					removedRules.push(cssRule);
 				}
 			}
@@ -373,45 +376,34 @@ function getDeclarationUnescapedValue(declarations, property, workStylesheet) {
 	return "";
 }
 
-function testUnicodeRange(docContent, unicodeRange) {
+function testUnicodeRange(docCharCodes, unicodeRange) {
 	if (unicodeRange) {
 		const unicodeRanges = unicodeRange.split(REGEXP_COMMA);
-		let invalid;
 		const result = unicodeRanges.filter(rangeValue => {
 			const range = rangeValue.split(REGEXP_DASH);
-			let regExpString;
 			if (range.length == 2) {
 				range[0] = transformRange(range[0]);
-				regExpString = "[" + range[0] + "-" + transformRange("U+" + range[1]) + "]";
-			}
-			if (range.length == 1) {
+				range[1] = transformRange(range[1]);
+			} else if (range.length == 1) {
 				if (range[0].includes("?")) {
-					const firstRange = transformRange(range[0]);
+					const firstRange = range[0];
 					const secondRange = firstRange;
-					regExpString = "[" + firstRange.replace(REGEXP_QUESTION_MARK, "0") + "-" + secondRange.replace(REGEXP_QUESTION_MARK, "F") + "]";
+					range[0] = transformRange(firstRange.replace(REGEXP_QUESTION_MARK, "0"));
+					range[1] = transformRange(secondRange.replace(REGEXP_QUESTION_MARK, "F"));
 				} else if (range[0]) {
-					regExpString = "[" + transformRange(range[0]) + "]";
+					range[0] = transformRange(range[0]);
 				}
 			}
-			if (regExpString) {
-				try {
-					return (new RegExp(regExpString, "u")).test(docContent);
-				} catch (error) {
-					invalid = true;
-					return false;
-				}
+			if (!range[0] || docCharCodes.find(charCode => charCode >= range[0] && charCode <= range[1])) {
+				return true;
 			}
-			return true;
 		});
-		return !invalid && (!unicodeRanges.length || result.length);
+		return (!unicodeRanges.length || result.length);
 	}
 	return true;
 }
 
 function transformRange(range) {
 	range = range.replace(REGEXP_STARTS_U_PLUS, "");
-	while (range.length < 6) {
-		range = "0" + range;
-	}
-	return "\\u{" + range + "}";
+	return parseInt(range, 16);
 }

package/modules/css-matched-rules.js

@@ -110,11 +110,8 @@ function getMatchedElementsRules(doc, cssRules, stylesheets, mediaInfo, sheetInd
 		log("  -- STARTED getMatchedElementsRules", " index =", sheetIndex, "rules.length =", cssRules.length);
 	}
 	cssRules.forEach(ruleData => {
-		if (ruleData.type == "Atrule" && ruleData.name == "import") {
-			const stylesheetEntry = Array.from(stylesheets.entries()).find(([key]) => key.urlNode == ruleData.prelude.children.head.data);
-			const stylesheetInfo = stylesheetEntry[1];
-			ruleData.importedChildren = stylesheetInfo.stylesheet.children;
-			getMatchedElementsRules(doc, ruleData.importedChildren, stylesheets, mediaInfo, sheetIndex, styles, matchedElementsCache, workStylesheet, indexes);
+		if (ruleData.type == "Atrule" && ruleData.name == "import" && ruleData.prelude && ruleData.prelude.children && ruleData.prelude.children.head.data.importedChildren) {
+			getMatchedElementsRules(doc, ruleData.prelude.children.head.data.importedChildren, stylesheets, mediaInfo, sheetIndex, styles, matchedElementsCache, workStylesheet, indexes);
 		} else if (ruleData.block && ruleData.block.children && ruleData.prelude && ruleData.prelude.children) {
 			if (ruleData.type == "Atrule" && ruleData.name == "media") {
 				const mediaText = cssTree.generate(ruleData.prelude);

package/modules/css-rules-minifier.js

@@ -71,10 +71,8 @@ function processRules(cssRules, sheetIndex, mediaInfo, indexes = { mediaRuleInde
 	const removedCssRules = [];
 	for (let cssRule = cssRules.head; cssRule; cssRule = cssRule.next) {
 		const ruleData = cssRule.data;
-		if (ruleData.type == "Atrule" && ruleData.name == "import") {
-			if (ruleData.importedChildren) {
-				processRules(ruleData.importedChildren, sheetIndex, mediaInfo, indexes);
-			}
+		if (ruleData.type == "Atrule" && ruleData.name == "import" && ruleData.prelude && ruleData.prelude.children && ruleData.prelude.children.head.data.importedChildren) {
+			processRules(ruleData.prelude.children.head.data.importedChildren, sheetIndex, mediaInfo, indexes);
 		} else if (ruleData.block && ruleData.block.children && ruleData.prelude && ruleData.prelude.children) {
 			if (ruleData.type == "Atrule" && ruleData.name == "media") {
 				const mediaText = cssTree.generate(ruleData.prelude);

package/package.json

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

package/processors/compression/compression-extract.js

@@ -138,7 +138,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 	}));
 	await zipReader.close();
 	indexPages.sort(sortByFilenameLength);
-	resources = resources.concat(...indexPages);
+	resources = resources.reverse().concat(...indexPages);
 	for (const resource of resources) {
 		let { textContent, mimeType, filename } = resource;
 		if (textContent !== undefined) {