single-file-core 1.3.13 → 1.3.15

package/core/index.js

@@ -473,13 +473,20 @@ class Processor {
 		this.doc = util.parseDocContent(pageContent, this.baseURI);
 		if (this.options.saveRawPage) {
 			let charset;
-			this.doc.querySelectorAll("meta[charset], meta[http-equiv=\"content-type\"]").forEach(element => {
-				const charsetDeclaration = element.content.split(";")[1];
-				if (charsetDeclaration && !charset) {
-					charset = charsetDeclaration.split("=")[1].trim().toLowerCase();
+			this.doc.querySelectorAll("meta[charset]").forEach(element => {
+				if (!charset) {
+					charset = element.getAttribute("charset").trim().toLowerCase();
 				}
 			});
-			if (charset && content.charset && charset.toLowerCase() != content.charset.toLowerCase()) {
+			if (!charset) {
+				this.doc.querySelectorAll("meta[http-equiv=\"content-type\"]").forEach(element => {
+					const charsetDeclaration = element.content.split(";")[1];
+					if (charsetDeclaration && !charset) {
+						charset = charsetDeclaration.split("=")[1].trim().toLowerCase();
+					}
+				});
+			}
+			if (charset && content.charset && charset != content.charset.toLowerCase()) {
 				return this.loadPage(pageContent, charset);
 			}
 		}
@@ -857,7 +864,7 @@ class Processor {
 		this.stats.set("discarded", "objects", objectElements.length);
 		this.stats.set("processed", "objects", objectElements.length);
 		objectElements.forEach(element => element.remove());
-		const replacedAttributeValue = this.doc.querySelectorAll("link[rel~=preconnect], link[rel~=prerender], link[rel~=dns-prefetch], link[rel~=preload], link[rel~=manifest], link[rel~=prefetch]");
+		const replacedAttributeValue = this.doc.querySelectorAll("link[rel~=preconnect], link[rel~=prerender], link[rel~=dns-prefetch], link[rel~=preload], link[rel~=manifest], link[rel~=prefetch], link[rel~=modulepreload]");
 		replacedAttributeValue.forEach(element => {
 			const relValue = element
 				.getAttribute("rel")

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

@@ -187,6 +187,8 @@ class ProcessorHelperCommon {
 					promises.push(processorHelper.processStyle(ruleData, options, resources, batchRequest));
 				} else if (ruleData.type == "Atrule" && (ruleData.name == "media" || ruleData.name == "supports")) {
 					promises.push(processorHelper.processStylesheet(ruleData.block.children, baseURI, options, resources, batchRequest));
+				} else if (ruleData.type == "Atrule" && (ruleData.name == "media" || ruleData.name == "layer")) {
+					promises.push(processorHelper.processStylesheet(ruleData.block.children, baseURI, options, resources, batchRequest));
 				} else if (ruleData.type == "Atrule" && ruleData.name == "font-face") {
 					promises.push(processFontFaceRule(ruleData));
 				}
@@ -396,7 +398,8 @@ class ProcessorHelperCommon {
 		const fontsDetails = {
 			fonts: new Map(),
 			medias: new Map(),
-			supports: new Map()
+			supports: new Map(),
+			layers: new Map()
 		};
 		const stats = { rules: { processed: 0, discarded: 0 }, fonts: { processed: 0, discarded: 0 } };
 		let sheetIndex = 0;
@@ -433,7 +436,7 @@ class ProcessorHelperCommon {
 
 	async processFontFaceRules(cssRules, sheetIndex, fontsDetails, fonts, fontTests, stats) {
 		const removedRules = [];
-		let mediaIndex = 0, supportsIndex = 0;
+		let mediaIndex = 0, supportsIndex = 0, layerIndex = 0;
 		for (let cssRule = cssRules.head; cssRule; cssRule = cssRule.next) {
 			const ruleData = cssRule.data;
 			if (ruleData.type == "Atrule" && ruleData.name == "media" && ruleData.block && ruleData.block.children && ruleData.prelude) {
@@ -444,6 +447,10 @@ class ProcessorHelperCommon {
 				const supportsText = cssTree.generate(ruleData.prelude);
 				await this.processFontFaceRules(ruleData.block.children, sheetIndex, fontsDetails.supports.get("supports-" + sheetIndex + "-" + supportsIndex + "-" + supportsText), fonts, fontTests, stats);
 				supportsIndex++;
+			} else if (ruleData.type == "Atrule" && ruleData.name == "layer" && ruleData.block && ruleData.block.children && ruleData.prelude) {
+				const layerText = cssTree.generate(ruleData.prelude);
+				await this.processFontFaceRules(ruleData.block.children, sheetIndex, fontsDetails.layers.get("layer-" + sheetIndex + "-" + layerIndex + "-" + layerText), fonts, fontTests, stats);
+				layerIndex++;
 			} else if (ruleData.type == "Atrule" && ruleData.name == "font-face") {
 				const key = this.getFontKey(ruleData);
 				const fontInfo = fontsDetails.fonts.get(key);
@@ -458,7 +465,7 @@ class ProcessorHelperCommon {
 	}
 
 	getFontsDetails(doc, cssRules, sheetIndex, mediaFontsDetails) {
-		let mediaIndex = 0, supportsIndex = 0;
+		let mediaIndex = 0, supportsIndex = 0, layerIndex = 0;
 		cssRules.forEach(ruleData => {
 			if (ruleData.type == "Atrule" && ruleData.name == "media" && ruleData.block && ruleData.block.children && ruleData.prelude) {
 				const mediaText = cssTree.generate(ruleData.prelude);
@@ -472,6 +479,12 @@ class ProcessorHelperCommon {
 				mediaFontsDetails.supports.set("supports-" + sheetIndex + "-" + supportsIndex + "-" + supportsText, fontsDetails);
 				supportsIndex++;
 				this.getFontsDetails(doc, ruleData.block.children, sheetIndex, fontsDetails);
+			} else if (ruleData.type == "Atrule" && ruleData.name == "layer" && ruleData.block && ruleData.block.children && ruleData.prelude) {
+				const layerText = cssTree.generate(ruleData.prelude);
+				const fontsDetails = this.createFontsDetailsInfo();
+				mediaFontsDetails.layers.set("layer-" + sheetIndex + "-" + layerIndex + "-" + layerText, fontsDetails);
+				layerIndex++;
+				this.getFontsDetails(doc, ruleData.block.children, sheetIndex, fontsDetails);
 			} else if (ruleData.type == "Atrule" && ruleData.name == "font-face" && ruleData.block && ruleData.block.children) {
 				const fontKey = this.getFontKey(ruleData);
 				let fontInfo = mediaFontsDetails.fonts.get(fontKey);
@@ -499,7 +512,8 @@ class ProcessorHelperCommon {
 		return {
 			fonts: new Map(),
 			medias: new Map(),
-			supports: new Map()
+			supports: new Map(),
+			layers: new Map()
 		};
 	}
 
@@ -574,9 +588,11 @@ function processFontDetails(fontsDetails, fontResources) {
 	if (fontResources) {
 		fontsDetails.medias.forEach(mediaFontsDetails => processFontDetails(mediaFontsDetails, fontResources));
 		fontsDetails.supports.forEach(supportsFontsDetails => processFontDetails(supportsFontsDetails, fontResources));
+		fontsDetails.layers.forEach(layerFontsDetails => processFontDetails(layerFontsDetails, fontResources));
 	} else {
 		fontsDetails.medias.forEach(mediaFontsDetails => processFontDetails(mediaFontsDetails));
 		fontsDetails.supports.forEach(supportsFontsDetails => processFontDetails(supportsFontsDetails));
+		fontsDetails.layers.forEach(layerFontsDetails => processFontDetails(layerFontsDetails));
 	}
 }
 

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

@@ -533,7 +533,7 @@ function getProcessorHelperClass(utilInstance) {
 						fontTests.set(source.src, source.valid);
 					}
 				}));
-				const findSourceByFormat = (fontFormat, testValidity) => fontInfo.findLast(source => !source.src.match(EMPTY_URL_SOURCE) && source.format == fontFormat && (!testValidity || source.valid));
+				const findSourceByFormat = (fontFormat, testValidity) => util.findLast(fontInfo, source => !source.src.match(EMPTY_URL_SOURCE) && source.format == fontFormat && (!testValidity || source.valid));
 				const filterSources = fontSource => fontInfo.filter(source => source == fontSource || source.src.startsWith(LOCAL_SOURCE));
 				stats.fonts.processed += fontInfo.length;
 				stats.fonts.discarded += fontInfo.length;

package/core/lib/processor-helper.js

@@ -437,8 +437,8 @@ function getProcessorHelperClass(utilInstance) {
 					fontTests.set(source.src, source.valid);
 				}
 			}));
-			const findSourceByFormat = (fontFormat, testValidity) => fontInfo.findLast(source => !source.src.match(EMPTY_URL_SOURCE) && source.format == fontFormat && (!testValidity || source.valid));
-			const findSourceByContentType = (contentType, testValidity) => fontInfo.findLast(source => !source.src.match(EMPTY_URL_SOURCE) && source.contentType == contentType && (!testValidity || source.valid));
+			const findSourceByFormat = (fontFormat, testValidity) => util.findLast(fontInfo, source => !source.src.match(EMPTY_URL_SOURCE) && source.format == fontFormat && (!testValidity || source.valid));
+			const findSourceByContentType = (contentType, testValidity) => util.findLast(fontInfo, source => !source.src.match(EMPTY_URL_SOURCE) && source.contentType == contentType && (!testValidity || source.valid));
 			const filterSources = fontSource => fontInfo.filter(source => source == fontSource || source.src.startsWith(LOCAL_SOURCE));
 			stats.fonts.processed += fontInfo.length;
 			stats.fonts.discarded += fontInfo.length;

package/core/util.js

@@ -196,6 +196,18 @@ function getInstance(utilOptions) {
 		appendInfobar(doc, options) {
 			return helper.appendInfobar(doc, options);
 		},
+		findLast(array, callback) {
+			if (array.findLast && typeof array.findLast == "function") {
+				return array.findLast(callback);
+			} else {
+				let index = array.length;
+				while (index--) {
+					if (callback(array[index], index, array)) {
+						return array[index];
+					}
+				}
+			}
+		},
 		ON_BEFORE_CAPTURE_EVENT_NAME: helper.ON_BEFORE_CAPTURE_EVENT_NAME,
 		ON_AFTER_CAPTURE_EVENT_NAME: helper.ON_AFTER_CAPTURE_EVENT_NAME,
 		WIN_ID_ATTRIBUTE_NAME: helper.WIN_ID_ATTRIBUTE_NAME,

package/modules/template-formatter.js

@@ -26,7 +26,7 @@
 import { parse } from "./template-parser.js";
 import { getContentSize, digest } from "./../core/helper.js";
 
-const Blob = globalThis.Blob; 
+const Blob = globalThis.Blob;
 const FileReader = globalThis.FileReader;
 const URL = globalThis.URL;
 const URLSearchParams = globalThis.URLSearchParams;
@@ -16991,6 +16991,10 @@ async function evalTemplate(template = "", options, content, doc, dontReplaceSla
 		"length": value => value.length,
 		"url-search-name": (index = 0) => params[index] && params[index][0],
 		"url-search-value": (index = 0) => params[index] && params[index][1],
+		"url-search-named-value": name => {
+			const param = params.find(param => param[0] == name);
+			return (param && param[1]);
+		},
 		"url-search": name => {
 			const param = params.find(param => param[0] == name);
 			return (param && param[1]);
@@ -17030,6 +17034,9 @@ async function evalTemplate(template = "", options, content, doc, dontReplaceSla
 			const fn = functions[name];
 			if (fn) {
 				argument = argument.replace(/\\\\(.)/g, "$1");
+				if (!optionalArguments) {
+					optionalArguments = [];
+				}
 				optionalArguments = optionalArguments
 					.map(argument => argument.replace(/\\\\(.)/g, "$1"))
 					.filter(argument => argument != undefined && argument != null && argument != "");

package/package.json

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

package/processors/hooks/content/content-hooks-frames-web.js

@@ -191,7 +191,7 @@
 							const time = 0;
 							return { target, intersectionRatio, boundingClientRect, intersectionRect: boundingClientRect, isIntersecting, rootBounds, time };
 						});
-						observer.callback(params, intersectionObserver);
+						observer.callback.call(intersectionObserver, params, intersectionObserver);
 					}
 				});
 			}