single-file-core 1.3.14 → 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/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.14",
+  "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);
 					}
 				});
 			}