single-file-core 1.6.24 → 1.6.25

package/core/helper.js

@@ -69,6 +69,7 @@ const DISABLED_NOSCRIPT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "disable
 const SELECTED_CONTENT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "selected-content";
 const INVALID_ELEMENT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "invalid-element";
 const ASYNC_SCRIPT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "async-script";
+const CUSTOM_STYLESHEET_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "custom-stylesheet";
 const FLOW_ELEMENTS_SELECTOR = "*:not(base):not(link):not(meta):not(noscript):not(script):not(style):not(template):not(title)";
 const KEPT_TAG_NAMES = ["NOSCRIPT", "DISABLED-NOSCRIPT", "META", "LINK", "STYLE", "TITLE", "TEMPLATE", "SOURCE", "OBJECT", "SCRIPT", "HEAD", "BODY"];
 const INVOKABLE_ELEMENTS_SELECTOR = "[popover][id], dialog[id]";
@@ -173,6 +174,7 @@ export {
 	WIN_ID_ATTRIBUTE_NAME,
 	PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME,
 	REMOVED_CONTENT_ATTRIBUTE_NAME,
+	CUSTOM_STYLESHEET_ATTRIBUTE_NAME,
 	HIDDEN_CONTENT_ATTRIBUTE_NAME,
 	HIDDEN_FRAME_ATTRIBUTE_NAME,
 	IMAGE_ATTRIBUTE_NAME,
@@ -305,6 +307,9 @@ function preProcessDoc(doc, win, options) {
 		element.textContent = "";
 	});
 	initDoc(doc);
+	if (options.customStylesheet) {
+		insertCustomStylesheet(doc, options.customStylesheet);
+	}
 	if (doc.head) {
 		doc.head.querySelectorAll(FLOW_ELEMENTS_SELECTOR).forEach(element => element.hidden = true);
 	}
@@ -375,6 +380,16 @@ function preProcessDoc(doc, win, options) {
 	};
 }
 
+function insertCustomStylesheet(doc, content) {
+	const parentElement = doc.body || doc.documentElement;
+	if (parentElement) {
+		const styleElement = doc.createElement("style");
+		styleElement.setAttribute(CUSTOM_STYLESHEET_ATTRIBUTE_NAME, "");
+		styleElement.textContent = content;
+		parentElement.appendChild(styleElement);
+	}
+}
+
 function markInvalidNesting(doc) {
 	if (!doc.body) {
 		return;
@@ -1093,6 +1108,7 @@ function testHiddenElement(element, computedStyle) {
 
 function postProcessDoc(doc, markedElements, invalidElements) {
 	removeNestingMarkers(doc);
+	doc.querySelectorAll("style[" + CUSTOM_STYLESHEET_ATTRIBUTE_NAME + "]").forEach(element => element.remove());
 	doc.querySelectorAll("[" + DISABLED_NOSCRIPT_ATTRIBUTE_NAME + "]").forEach(element => {
 		element.textContent = element.getAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME);
 		element.removeAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME);

package/core/index.js

@@ -661,6 +661,7 @@ class Processor {
 	}
 
 	preProcessPage() {
+		this.doc.querySelectorAll("style[" + util.CUSTOM_STYLESHEET_ATTRIBUTE_NAME + "]").forEach(element => element.removeAttribute(util.CUSTOM_STYLESHEET_ATTRIBUTE_NAME));
 		this.doc.body.querySelectorAll(":not(svg) title, meta, link[href][rel*=\"icon\"]").forEach(element => {
 			if ((this.options.win && element instanceof this.options.win.HTMLElement) || element instanceof globalThis.HTMLElement) {
 				this.doc.head.appendChild(element);

package/core/lib/processor-helper.js

@@ -331,13 +331,15 @@ function getProcessorHelperClass(utilInstance) {
 				blockMixedContent: options.blockMixedContent,
 				...getStylesheetReferrer(resourceURL, options)
 			});
-			const name = "fonts/" + indexResource + extension;
+			const name = this.testEmptyResource(content) ? util.EMPTY_RESOURCE : "fonts/" + indexResource + extension;
 			if (!isDataURL(resourceURL) && options.saveOriginalURLs) {
 				urlNode.value = "-sf-url-original(" + JSON.stringify(originalResourceURL) + ") " + name;
 			} else {
 				urlNode.value = name;
 			}
-			resources.fonts.set(indexResource, { name, content, extension, contentType, url: resourceURL });
+			if (!this.testEmptyResource(content)) {
+				resources.fonts.set(indexResource, { name, content, extension, contentType, url: resourceURL });
+			}
 		}
 
 		groupDuplicateFonts(stylesheets, fonts) {
@@ -412,13 +414,15 @@ function getProcessorHelperClass(utilInstance) {
 					if ((!testIgnoredPath(resourceURL) && testValidURL(resourceURL)) || testGeneratedDataURI(resourceURL, options)) {
 						let { content, indexResource, contentType, extension } = await batchRequest.addURL(resourceURL,
 							{ asBinary: true, expectedType: "image", ...getStylesheetReferrer(resourceURL, options) });
-						const name = "images/" + indexResource + extension;
+						const name = this.testEmptyResource(content) ? util.EMPTY_RESOURCE : "images/" + indexResource + extension;
 						if (!isDataURL(resourceURL) && options.saveOriginalURLs) {
 							urlNode.value = "-sf-url-original(" + JSON.stringify(originalResourceURL) + ") " + name;
 						} else {
 							urlNode.value = name;
 						}
-						resources.images.set(indexResource, { name, content, extension, contentType, url: resourceURL });
+						if (!this.testEmptyResource(content)) {
+							resources.images.set(indexResource, { name, content, extension, contentType, url: resourceURL });
+						}
 					}
 				} else {
 					urlNode.value = util.EMPTY_RESOURCE;
@@ -505,8 +509,10 @@ function getProcessorHelperClass(utilInstance) {
 
 		async processImageSrcset(resourceURL, srcsetValue, resources, batchRequest, resourceElement) {
 			const { content, indexResource, extension, contentType } = await batchRequest.addURL(resourceURL, { asBinary: true, expectedType: "image", referrerPolicy: getReferrerPolicy(resourceElement) });
-			const name = "images/" + indexResource + extension;
-			resources.images.set(indexResource, { name, content, extension, contentType, url: resourceURL });
+			const name = this.testEmptyResource(content) ? util.EMPTY_RESOURCE : "images/" + indexResource + extension;
+			if (!this.testEmptyResource(content)) {
+				resources.images.set(indexResource, { name, content, extension, contentType, url: resourceURL });
+			}
 			resourceElement.removeAttribute(CROSS_ORIGIN_ATTRIBUTE_NAME);
 			return serializeSrcset([Object.assign({}, srcsetValue, { url: name })]);
 		}

package/core/util.js

@@ -70,6 +70,8 @@ const ZIP_FILENAME_OFFSET = 30;
 const USD_FILENAME_REGEXP = /\.usd[ac]?$/i;
 const CONTENT_TYPES_HTML = ["text/html", "application/xhtml+xml"];
 const EXPECTED_TYPES_MEDIA = ["font", "image", "video", "audio", "model"];
+const EXPECTED_TYPE_IMAGE = "image";
+const EXPECTED_TYPE_DOCUMENT = "document";
 
 const URL = globalThis.URL;
 const DOMParser = globalThis.DOMParser;
@@ -226,6 +228,7 @@ function getInstance(utilOptions) {
 		PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME: helper.PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME,
 		STYLESHEET_ATTRIBUTE_NAME: helper.STYLESHEET_ATTRIBUTE_NAME,
 		LINK_STYLESHEET_ATTRIBUTE_NAME: helper.LINK_STYLESHEET_ATTRIBUTE_NAME,
+		CUSTOM_STYLESHEET_ATTRIBUTE_NAME: helper.CUSTOM_STYLESHEET_ATTRIBUTE_NAME,
 		SELECTED_CONTENT_ATTRIBUTE_NAME: helper.SELECTED_CONTENT_ATTRIBUTE_NAME,
 		INVALID_ELEMENT_ATTRIBUTE_NAME: helper.INVALID_ELEMENT_ATTRIBUTE_NAME,
 		COMMENT_HEADER: helper.COMMENT_HEADER,
@@ -320,7 +323,7 @@ function getInstance(utilOptions) {
 			charset = options.charset;
 		}
 		if (options.asBinary) {
-			if (response.status >= 400 || (EXPECTED_TYPES_MEDIA.includes(options.expectedType) && CONTENT_TYPES_HTML.includes(contentType))) {
+			if ((response.status >= 400 && options.expectedType != EXPECTED_TYPE_IMAGE) || (EXPECTED_TYPES_MEDIA.includes(options.expectedType) && CONTENT_TYPES_HTML.includes(contentType))) {
 				return getFetchResponse(resourceURL, options);
 			}
 			try {
@@ -337,7 +340,7 @@ function getInstance(utilOptions) {
 				return getFetchResponse(resourceURL, options);
 			}
 		} else {
-			if (response.status >= 400) {
+			if (response.status >= 400 && options.expectedType != EXPECTED_TYPE_DOCUMENT) {
 				return getFailedFetchResponse(resourceURL, options);
 			}
 			if (options.validateTextContentType && contentType && !contentType.startsWith(PREFIX_CONTENT_TYPE_TEXT)) {

package/package.json

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