single-file-core 1.2.24 → 1.2.26

package/modules/template-formatter.js

@@ -28,6 +28,7 @@ import { parse } from "./template-parser.js";
 // eslint-disable-next-line quotes
 const DEFAULT_REPLACED_CHARACTERS = ["~", "+", "\\\\", "?", "%", "*", ":", "|", '"', "<", ">", "\x00-\x1f", "\x7F"];
 const DEFAULT_REPLACEMENT_CHARACTER = "_";
+const REGEXP_ESCAPE = /([{}()^$&.*?/+|[\\\\]|\]|-)/g;
 
 const EMOJI_NAMES = {
 	"😀": "grinning-face",
@@ -16867,7 +16868,7 @@ export { formatFilename, evalTemplate };
 async function formatFilename(content, doc, options, util) {
 	let filename = (await evalTemplate(options.filenameTemplate, options, util, content, doc)) || "";
 	if (options.replaceEmojisInFilename) {
-		EMOJIS.forEach(emoji => (filename = filename.replaceAll(emoji, " _" + EMOJI_NAMES[emoji] + "_ ")));
+		EMOJIS.forEach(emoji => (filename = replaceAll(filename, emoji, " _" + EMOJI_NAMES[emoji] + "_ ")));
 	}
 	const replacementCharacter = options.filenameReplacementCharacter;
 	filename = getValidFilename(filename, options.filenameReplacedCharacters, replacementCharacter);
@@ -16883,6 +16884,9 @@ async function formatFilename(content, doc, options, util) {
 	if (!filename) {
 		filename = "Unnamed page";
 	}
+	if (filename.startsWith(".")) {
+		filename = "Unnamed page" + filename;
+	}
 	return filename.trim();
 }
 
@@ -16967,7 +16971,7 @@ async function evalTemplate(template = "", options, util, content, doc, dontRepl
 		"lowercase": value => value.toLowerCase(),
 		"uppercase": value => value.toUpperCase(),
 		"capitalize": value => value.charAt(0).toUpperCase() + value.slice(1),
-		"replace": (value, searchValue, replaceValue) => searchValue && replaceValue ? value.replaceAll(searchValue, replaceValue) : value,
+		"replace": (value, searchValue, replaceValue) => searchValue && replaceValue ? replaceAll(value, searchValue, replaceValue) : value,
 		"trim": value => value.trim(),
 		"trim-left": value => value.trimLeft(),
 		"trim-right": value => value.trimRight(),
@@ -17009,17 +17013,19 @@ async function evalTemplate(template = "", options, util, content, doc, dontRepl
 			return element && element.getAttribute(attribute);
 		};
 	}
-	template = template.replaceAll("\\%", "\\\\%");
-	template = template.replaceAll("\\{", "\\\\{");
-	template = template.replaceAll("\\|", "\\\\|");
-	template = template.replaceAll("\\>", "\\\\>");
+	template = replaceAll(template, "\\%", "\\\\%");
+	template = replaceAll(template, "\\{", "\\\\{");
+	template = replaceAll(template, "\\|", "\\\\|");
+	template = replaceAll(template, "\\>", "\\\\>");
 	const result = (await parse(template, {
 		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"));
-				if (argument != undefined && argument != null && argument != "") {
+				optionalArguments = optionalArguments
+					.map(argument => argument.replace(/\\\\(.)/g, "$1"))
+					.filter(argument => argument != undefined && argument != null && argument != "");
+				if ((argument != undefined && argument != null && argument != "") || optionalArguments.length > 0) {
 					try {
 						return await getValue(() => fn(argument, ...optionalArguments), true, options.filenameReplacementCharacter, lengthData);
 					} catch (error) {
@@ -17042,10 +17048,10 @@ async function evalTemplate(template = "", options, util, content, doc, dontRepl
 		}
 	}));
 	let resultString = result.join("");
-	resultString = resultString.replaceAll("\\\\%", "%");
-	resultString = resultString.replaceAll("\\\\{", "{");
-	resultString = resultString.replaceAll("\\\\|", "|");
-	resultString = resultString.replaceAll("\\\\>", ">");
+	resultString = replaceAll(resultString, "\\\\%", "%");
+	resultString = replaceAll(resultString, "\\\\{", "{");
+	resultString = replaceAll(resultString, "\\\\|", "|");
+	resultString = replaceAll(resultString, "\\\\>", ">");
 	return resultString;
 
 	function addDateVariables(date, prefix = "") {
@@ -17072,6 +17078,15 @@ async function evalTemplate(template = "", options, util, content, doc, dontRepl
 	}
 }
 
+function replaceAll(string, search, replacement) {
+	if (typeof string.replaceAll == "function") {
+		return string.replaceAll(search, replacement);
+	} else {
+		const searchRegExp = new RegExp(search.replace(REGEXP_ESCAPE, "\\$1"), "g");
+		return string.replace(searchRegExp, replacement);
+	}
+}
+
 async function getValue(valueGetter, dontReplaceSlash, replacementCharacter, lengthData) {
 	const { maxLength, maxCharLength } = extractMaxLength(lengthData);
 	let value = (await valueGetter()) || "";

package/package.json

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

package/processors/compression/compression-extract.js

@@ -70,6 +70,8 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 	const REGEXP_MATCH_INDEX = /index\.html$/;
 	const REGEXP_MATCH_FRAMES = /frames\//;
 	const CHARSET_UTF8 = ";charset=utf-8";
+	const REGEXP_ESCAPE = /([{}()^$&.*?/+|[\\\\]|\]|-)/g;
+
 	if (Array.isArray(content)) {
 		content = new Blob([new Uint8Array(content)]);
 	}
@@ -142,7 +144,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 							const position = textContent.indexOf(relativeFilename);
 							if (position != -1) {
 								parentResources.push(resourceFilename);
-								textContent = textContent.replaceAll(relativeFilename, content);
+								textContent = replaceAll(textContent, relativeFilename, content);
 							}
 						}
 					}
@@ -175,4 +177,13 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 			reader.onerror = reject;
 		});
 	}
+
+	function replaceAll(string, search, replacement) {
+		if (typeof string.replaceAll == "function") {
+			return string.replaceAll(search, replacement);
+		} else {
+			const searchRegExp = new RegExp(search.replace(REGEXP_ESCAPE, "\\$1"), "g");
+			return string.replace(searchRegExp, replacement);
+		}
+	}
 }

package/processors/compression/compression.js

@@ -21,7 +21,7 @@
  *   Source.
  */
 
-/* global globalThis, FileReader, TextDecoder, Node */
+/* global globalThis, FileReader, Node */
 
 import {
 	configure,
@@ -85,10 +85,11 @@ async function process(pageData, options, lastModDate = new Date()) {
 		const substitutionsLF = [];
 		if (options.extractDataFromPage) {
 			if (!options.extractDataFromPageTags) {
-				const textContent = new TextDecoder().decode(data);
+				let textContent = "";
+				data.slice(startOffset).forEach(charCode => textContent += String.fromCharCode(charCode));
 				const matchEndTagComment = textContent.match(/-->/i);
 				if (matchEndTagComment) {
-					return findExtraDataTags(data, pageData, options, lastModDate);
+					return findExtraDataTags(textContent, pageData, options, lastModDate);
 				}
 			}
 			for (let index = 0; index < data.length; index++) {
@@ -218,12 +219,11 @@ async function prependHTMLData(pageData, zipDataWriter, script, options) {
 	return extraDataOffset;
 }
 
-function findExtraDataTags(data, pageData, options, lastModDate, indexExtractDataFromPageTags = 0) {
-	const textContent = new TextDecoder().decode(data);
+function findExtraDataTags(textContent, pageData, options, lastModDate, indexExtractDataFromPageTags = 0) {
 	const matchEndTag = textContent.match(EXTRA_DATA_REGEXPS[indexExtractDataFromPageTags]);
 	if (matchEndTag) {
 		if (indexExtractDataFromPageTags < EXTRA_DATA_TAGS.length - 1) {
-			return findExtraDataTags(data, pageData, options, lastModDate, indexExtractDataFromPageTags + 1);
+			return findExtraDataTags(textContent, pageData, options, lastModDate, indexExtractDataFromPageTags + 1);
 		} else {
 			options.extractDataFromPage = false;
 			return process(pageData, options, lastModDate);

package/single-file.js

@@ -111,6 +111,7 @@ async function getPageData(options = {}, initOptions, doc = globalThis.document,
 			createRootDirectory: options.createRootDirectory,
 			selfExtractingArchive: options.selfExtractingArchive,
 			extractDataFromPage: options.extractDataFromPage,
+			preventAppendedData: options.preventAppendedData,
 			insertCanonicalLink: options.insertCanonicalLink,
 			insertMetaNoIndex: options.insertMetaNoIndex,
 			password: options.password,