single-file-core 1.2.28 → 1.2.30

package/core/lib/processor-helper-common.js

@@ -443,10 +443,7 @@ class ProcessorHelperCommon {
 				const key = this.getFontKey(ruleData);
 				const fontInfo = fontsDetails.fonts.get(key);
 				if (fontInfo) {
-					const processed = await this.processFontFaceRule(ruleData, fontInfo, fonts, fontTests, stats);
-					if (processed) {
-						fontsDetails.fonts.delete(key);
-					}
+					await this.processFontFaceRule(ruleData, fontInfo, fonts, fontTests, stats);
 				} else {
 					removedRules.push(cssRule);
 				}
@@ -481,7 +478,12 @@ class ProcessorHelperCommon {
 				if (src) {
 					const fontSources = src.match(REGEXP_URL_FUNCTION);
 					if (fontSources) {
-						fontSources.forEach(source => fontInfo.unshift(source));
+						fontSources.forEach(source => {
+							if (fontInfo.includes(source)) {
+								fontInfo.splice(fontInfo.indexOf(source), 1);
+							}
+							fontInfo.unshift(source);
+						});
 					}
 				}
 			}

package/core/lib/processor-helper-inline.js

@@ -557,9 +557,6 @@ function getProcessorHelperClass(utilInstance) {
 				catch (error) {
 					// ignored
 				}
-				return true;
-			} else {
-				return false;
 			}
 		}
 	};

package/core/lib/processor-helper.js

@@ -91,7 +91,9 @@ function getProcessorHelperClass(utilInstance) {
 		}
 
 		replaceStylesheets(doc, stylesheets, options, resources) {
-			for (const [key, stylesheetInfo] of stylesheets) {
+			const entries = Array.from(stylesheets);
+			entries.reverse();
+			for (const [key, stylesheetInfo] of entries) {
 				if (key.urlNode) {
 					const name = "stylesheet_" + resources.stylesheets.size + ".css";
 					if (!isDataURL(stylesheetInfo.url) && options.saveOriginalURLs) {
@@ -100,10 +102,7 @@ function getProcessorHelperClass(utilInstance) {
 						key.urlNode.value = name;
 					}
 					resources.stylesheets.set(resources.stylesheets.size, { name, content: this.generateStylesheetContent(stylesheetInfo.stylesheet, options), url: stylesheetInfo.url });
-				}
-			}
-			for (const [key, stylesheetInfo] of stylesheets) {
-				if (key.element) {
+				} else {
 					if (key.element.tagName.toUpperCase() == "LINK") {
 						const linkElement = key.element;
 						const name = "stylesheet_" + resources.stylesheets.size + ".css";
@@ -485,7 +484,6 @@ function getProcessorHelperClass(utilInstance) {
 				catch (error) {
 					// ignored
 				}
-				return true;
 			}
 		}
 	};

package/package.json

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

package/processors/compression/compression-extract.js

@@ -80,7 +80,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 	const zipReader = new zip.ZipReader(blobReader);
 	const entries = await zipReader.getEntries();
 	const options = { password };
-	let docContent, origDocContent, url, resources = [];
+	let docContent, origDocContent, url, resources = [], indexPages = [];
 	await Promise.all(entries.map(async entry => {
 		const { filename } = entry;
 		let dataWriter, content, textContent, mimeType;
@@ -119,10 +119,19 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 			}
 		}
 		const name = entry.filename.match(/^([0-9_]+\/)?(.*)$/)[2];
-		resources.push({ filename: entry.filename, name, url: entry.comment, content, mimeType, textContent, parentResources: [] });
+		const resourceInfo = { filename: entry.filename, name, url: entry.comment, content, mimeType, textContent, parentResources: [] };
+		if (filename.match(REGEXP_MATCH_INDEX)) {
+			indexPages.push(resourceInfo);
+		} else {
+			resources.push(resourceInfo);
+		}
 	}));
 	await zipReader.close();
-	resources = resources.sort((resourceLeft, resourceRight) => resourceRight.filename.length - resourceLeft.filename.length);
+	resources.reverse();
+	resources.sort(sortByFilenameLength);
+	indexPages.sort(sortByFilenameLength);
+	resources.sort((resourceLeft, resourceRight) => resourceRight.textContent ? -1 : resourceLeft.textContent ? 1 : 0);
+	resources = resources.concat(...indexPages);
 	for (const resource of resources) {
 		let { textContent, mimeType, filename } = resource;
 		if (textContent !== undefined) {
@@ -186,4 +195,8 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 			return string.replace(searchRegExp, replacement);
 		}
 	}
+
+	function sortByFilenameLength(resourceLeft, resourceRight) {
+		return resourceRight.filename.length - resourceLeft.filename.length;
+	}
 }