single-file-core 1.2.16 → 1.2.18

package/core/index.js

@@ -109,6 +109,7 @@ const STAGES = [{
 		{ action: "replaceStyleContents" },
 		{ action: "replaceInvalidElements" },
 		{ action: "resetCharsetMeta" },
+		{ action: "resetReferrerMeta" },
 		{ option: "saveFavicon", action: "saveFavicon" },
 		{ action: "insertFonts" },
 		{ action: "insertShadowRootContents" },
@@ -866,6 +867,14 @@ class Processor {
 		}
 	}
 
+	resetReferrerMeta() {
+		this.doc.querySelectorAll("meta[name=referrer]").forEach(element => element.remove());
+		const metaElement = this.doc.createElement("meta");
+		metaElement.setAttribute("name", "referrer");
+		metaElement.setAttribute("content", "no-referrer");
+		this.doc.head.appendChild(metaElement);
+	}
+
 	setInputValues() {
 		this.doc.querySelectorAll("input:not([type=radio]):not([type=checkbox])").forEach(input => {
 			const value = input.getAttribute(util.INPUT_VALUE_ATTRIBUTE_NAME);

package/modules/template-formatter.js

@@ -16883,7 +16883,7 @@ async function formatFilename(content, doc, options, util) {
 	if (!filename) {
 		filename = "Unnamed page";
 	}
-	return filename;
+	return filename.trim();
 }
 
 async function evalTemplate(template = "", options, util, content, doc, dontReplaceSlash) {
@@ -16954,27 +16954,49 @@ async function evalTemplate(template = "", options, util, content, doc, dontRepl
 			const foundValue = values.find(value => value);
 			return foundValue ? foundValue : defaultValue;
 		},
-		"if-not-empty": (values) => {
+		"if-not-empty": (...values) => {
 			const defaultValue = values.pop();
 			const foundValue = values.find(value => value);
 			return foundValue ? defaultValue : foundValue;
 		},
+		"if-equals": (value, otherValue, trueValue, falseValue) => value == otherValue ? trueValue : falseValue,
+		"if-not-equals": (value, otherValue, trueValue, falseValue) => value != otherValue ? trueValue : falseValue,
+		"if-contains": (value, otherValue, trueValue, falseValue) => otherValue && value.includes(otherValue) ? trueValue : falseValue,
+		"if-not-contains": (value, otherValue, trueValue, falseValue) => otherValue && !value.includes(otherValue) ? trueValue : falseValue,
 		"substring": (value, start, end) => value.substring(start, end),
 		"lowercase": value => value.toLowerCase(),
 		"uppercase": value => value.toUpperCase(),
-		"capitalize": value => value.replace(/(?:^|\s)\S/g, a => a.toUpperCase()),
-		"replace": (value, searchValue, replaceValue) => value.replaceAll(searchValue, replaceValue),
+		"replace": (value, searchValue, replaceValue) => searchValue && replaceValue ? value.replaceAll(searchValue, replaceValue) : value,
 		"trim": value => value.trim(),
 		"trim-left": value => value.trimLeft(),
 		"trim-right": value => value.trimRight(),
-		"pad-left": (value, length, padString) => value.padStart(length, padString),
-		"pad-right": (value, length, padString) => value.padEnd(length, padString),
+		"pad-left": (value, length, padString) => length > 0 ? value.padStart(length, padString) : value,
+		"pad-right": (value, length, padString) => length > 0 ? value.padEnd(length, padString) : value,
+		"repeat": (value, count) => count > 0 ? value.repeat(count) : "",
+		"index-of": (value, searchValue) => value.indexOf(searchValue),
+		"last-index-of": (value, searchValue) => value.lastIndexOf(searchValue),
+		"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": name => {
 			const param = params.find(param => param[0] == name);
-			return param && param[1];
-		}
+			return (param && param[1]);
+		},
+		"url-segment": (index = 0) => {
+			const segments = decode(url.pathname).split("/");
+			segments.pop();
+			segments.push(getLastSegment(url, options.filenameReplacementCharacter));
+			return segments[index];
+		},
+		"url-hostname-subdomain": (index = 0) => {
+			const subdomains = urlSubDomains.split(".");
+			return subdomains[subdomains.length - index - 1];
+		},
+		"stringify": value => JSON.stringify(value),
+		"encode-uri": value => encodeURIComponent(value),
+		"decode-uri": value => decodeURIComponent(value),
+		"encode-uri-component": value => encodeURI(value),
+		"decode-uri-component": value => decodeURI(value)
 	};
 	if (doc) {
 		functions["page-element-text"] = (selector) => {
@@ -16991,12 +17013,20 @@ async function evalTemplate(template = "", options, util, content, doc, dontRepl
 	template = template.replaceAll("\\|", "\\\\|");
 	template = template.replaceAll("\\>", "\\\\>");
 	const result = (await parse(template, {
-		callFunction(name, [argument, optionalArguments], lengthData) {
+		async callFunction(name, [argument, optionalArguments], lengthData) {
 			const fn = functions[name];
 			if (fn) {
 				argument = argument.replace(/\\\\(.)/g, "$1");
 				optionalArguments = optionalArguments.map(argument => argument.replace(/\\\\(.)/g, "$1"));
-				return getValue(() => fn(argument, ...optionalArguments), true, options.filenameReplacementCharacter, lengthData);
+				if (argument != undefined && argument != null && argument != "") {
+					try {
+						return await getValue(() => fn(argument, ...optionalArguments), true, options.filenameReplacementCharacter, lengthData);
+					} catch (error) {
+						return "";
+					}
+				} else {
+					return "";
+				}
 			} else {
 				return "";
 			}
@@ -17043,7 +17073,7 @@ async function evalTemplate(template = "", options, util, content, doc, dontRepl
 
 async function getValue(valueGetter, dontReplaceSlash, replacementCharacter, lengthData) {
 	const { maxLength, maxCharLength } = extractMaxLength(lengthData);
-	let value = await valueGetter();
+	let value = (await valueGetter()) || "";
 	if (!dontReplaceSlash) {
 		value = value.replace(/\/+/g, replacementCharacter);
 	}

package/package.json

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