single-file-core 1.6.15 → 1.6.17

package/core/index.js

@@ -526,6 +526,7 @@ class Processor {
 				return this.loadPage(pageContent, charset);
 			}
 		}
+		await this.processorHelper.resizeCanvasImages(this.doc, this.options.canvases, this.options);
 		this.workStyleElement = this.doc.createElement("style");
 		this.doc.body.appendChild(this.workStyleElement);
 		this.onEventAttributeNames = new Set(getOnEventAttributeNames(this.doc));

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

@@ -64,6 +64,8 @@ const FONT_STRETCHES = {
 const Blob = globalThis.Blob;
 const Image = globalThis.Image;
 const OffscreenCanvas = globalThis.OffscreenCanvas;
+const DEFAULT_IMAGE_QUALITY = 0.8;
+const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
 
 let util, cssTree;
 
@@ -266,6 +268,16 @@ class ProcessorHelperCommon {
 		}
 	}
 
+	async resizeCanvasImages(doc, canvases, options) {
+		if (canvases && options.imageReductionFactor > 1) {
+			await Promise.all(canvases.map(async canvasData => {
+				if (canvasData && canvasData.dataURI) {
+					canvasData.dataURI = await resizeImage(doc, canvasData.dataURI, options);
+				}
+			}));
+		}
+	}
+
 	setBackgroundImage(element, url, style) {
 		element.style.setProperty("background-blend-mode", "normal", "important");
 		element.style.setProperty("background-clip", "content-box", "important");
@@ -690,7 +702,7 @@ function getFontStretch(stretch) {
 	return FONT_STRETCHES[stretch] || stretch;
 }
 
-async function resizeImage(doc, dataURI, { imageReductionFactor }) {
+async function resizeImage(doc, dataURI, { imageReductionFactor, imageQuality }, element) {
 	if (dataURI) {
 		const contentType = dataURI.substring(5, dataURI.indexOf(";"));
 		if (contentType == "image/jpeg" ||
@@ -705,28 +717,33 @@ async function resizeImage(doc, dataURI, { imageReductionFactor }) {
 				});
 				const width = image.naturalWidth / imageReductionFactor;
 				const height = image.naturalHeight / imageReductionFactor;
+				const quality = imageQuality === undefined ? DEFAULT_IMAGE_QUALITY : Number(imageQuality);
 				let blob;
 				try {
 					const canvas = new OffscreenCanvas(width, height);
 					const context = canvas.getContext("2d");
 					context.drawImage(image, 0, 0, width, height);
-					blob = await canvas.convertToBlob({ type: contentType });
+					blob = await canvas.convertToBlob({ type: contentType, quality });
 				} catch {
 					const canvas = doc.createElement("canvas");
 					canvas.width = width;
 					canvas.height = height;
 					const context = canvas.getContext("2d");
 					context.drawImage(image, 0, 0, width, height);
-					blob = await new Promise(resolve => canvas.toBlob(blob => {
+					blob = await new Promise((resolve, reject) => canvas.toBlob(blob => {
 						if (blob) {
 							resolve(blob);
 						} else {
-							throw new Error("Canvas toBlob failed");
+							reject(new Error("Canvas toBlob failed"));
 						}
-					}, contentType));
+					}, contentType, quality));
 				}
 				if (blob.type == contentType) {
 					dataURI = await toDataURI(blob, contentType);
+					if (element && isUnsizedSVGImage(element)) {
+						element.setAttribute("width", image.naturalWidth);
+						element.setAttribute("height", image.naturalHeight);
+					}
 				}
 			} catch {
 				// ignored
@@ -736,6 +753,17 @@ async function resizeImage(doc, dataURI, { imageReductionFactor }) {
 	return dataURI;
 }
 
+function isUnsizedSVGImage(element) {
+	return element.namespaceURI == SVG_NAMESPACE &&
+		element.localName == "image" &&
+		isAutoSize(element.getAttribute("width")) &&
+		isAutoSize(element.getAttribute("height"));
+}
+
+function isAutoSize(value) {
+	return value == null || value.trim().toLowerCase() == "auto";
+}
+
 function toDataURI(content, contentType, charset) {
 	const blob = content instanceof Blob ? content : new Blob([content], { type: (contentType || "") + (charset ? ";charset=" + charset : "") });
 	return getDataURI(blob);

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

@@ -403,7 +403,7 @@ function getProcessorHelperClass(utilInstance) {
 										}
 									}
 									if (options.imageReductionFactor > 1 && expectedType == "image") {
-										content = await resizeImage(doc, content, options);
+										content = await resizeImage(doc, content, options, resourceElement);
 									}
 									if (removeElementIfMissing && this.testEmptyResource(content)) {
 										resourceElement.remove();

package/core/lib/processor-helper.js

@@ -470,7 +470,7 @@ function getProcessorHelperClass(utilInstance) {
 										}
 									}
 									if (options.imageReductionFactor > 1 && expectedType == "image") {
-										const dataURI = await resizeImage(doc, await toDataURI(new Blob([content], { type: contentType }), charset), options);
+										const dataURI = await resizeImage(doc, await toDataURI(new Blob([content], { type: contentType }), charset), options, resourceElement);
 										content = (await util.getContent(dataURI, { asBinary: true })).data;
 									}
 									if (removeElementIfMissing && this.testEmptyResource(content)) {

package/modules/css-rules-minifier.js

@@ -643,7 +643,7 @@ function getRemovableSelectors(ruleData, removedSelectors, docContext) {
 	const removedSet = new Set(removedSelectors);
 	let keptSpecificity = { a: 0, b: 0, c: 0 };
 	for (let selector = ruleData.prelude.children.head; selector; selector = selector.next) {
-		if (!removedSet.has(selector)) {
+		if (!removedSet.has(selector) && !hasPseudoElement(selector.data)) {
 			const { specificity } = docContext.selectorData.get(selector);
 			if (compareSpecificities(specificity, keptSpecificity) > 0) {
 				keptSpecificity = specificity;

package/package.json

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