single-file-core 1.5.100 → 1.5.102

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

@@ -26,6 +26,7 @@ import {
 	getFontWeight,
 	getDataURI
 } from "./../helper.js";
+import { serialize as serializeSrcset } from "./../../vendor/html-srcset-parser.js";
 
 const DATA_URI_PREFIX = "data:";
 const ABOUT_BLANK_URI = "about:blank";
@@ -244,7 +245,7 @@ class ProcessorHelperCommon {
 							return "";
 						}
 					} else {
-						return resourceURL + (srcsetValue.w ? " " + srcsetValue.w + "w" : srcsetValue.d ? " " + srcsetValue.d + "x" : "");
+						return serializeSrcset([Object.assign({}, srcsetValue, { url: resourceURL })]);
 					}
 				}));
 				resourceElement.setAttribute("srcset", srcsetValues.join(", "));

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

@@ -22,6 +22,7 @@
  */
 
 import * as cssTree from "./../../vendor/css-tree.js";
+import { serialize as serializeSrcset } from "./../../vendor/html-srcset-parser.js";
 
 const JSON = globalThis.JSON;
 const FontFace = globalThis.FontFace;
@@ -454,9 +455,7 @@ function getProcessorHelperClass(utilInstance) {
 			if (forbiddenPrefixFound) {
 				return "";
 			}
-			return content + (srcsetValue.w ? " " + srcsetValue.w + "w" :
-				srcsetValue.h ? " " + srcsetValue.h + "h" :
-					srcsetValue.d ? " " + srcsetValue.d + "x" : "");
+			return serializeSrcset([Object.assign({}, srcsetValue, { url: content })]);
 		}
 
 		testEmptyResource(resource) {

package/core/lib/processor-helper.js

@@ -22,6 +22,7 @@
  */
 
 import * as cssTree from "./../../vendor/css-tree.js";
+import { serialize as serializeSrcset } from "./../../vendor/html-srcset-parser.js";
 
 const JSON = globalThis.JSON;
 const FontFace = globalThis.FontFace;
@@ -390,9 +391,7 @@ function getProcessorHelperClass(utilInstance) {
 			const { content, indexResource, extension, contentType } = await batchRequest.addURL(resourceURL, { asBinary: true, expectedType: "image" });
 			const name = "images/" + indexResource + extension;
 			resources.images.set(indexResource, { name, content, extension, contentType, url: resourceURL });
-			return name + (srcsetValue.w ? " " + srcsetValue.w + "w" :
-				srcsetValue.h ? " " + srcsetValue.h + "h" :
-					srcsetValue.d ? " " + srcsetValue.d + "x" : "");
+			return serializeSrcset([Object.assign({}, srcsetValue, { url: name })]);
 		}
 
 		testEmptyResource(resource) {

package/modules/template-formatter.js

@@ -16890,7 +16890,12 @@ async function formatFilename(content, doc, options) {
 		filename = "Unnamed page";
 	}
 	if (filename.startsWith(".")) {
-		filename = "Unnamed page" + filename;
+		const nameWithoutExtension = filename.replace(/\.[^.]{3,4}$/, "");
+		if (/^\.*$/.test(nameWithoutExtension)) {
+			filename = "Unnamed page" + filename;
+		} else {
+			filename = filenameReplacementCharacter + filename;
+		}
 	}
 	return filename.trim();
 }

package/package.json

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

package/processors/compression/compression-extract.js

@@ -27,7 +27,7 @@ export {
 	extract
 };
 
-async function extract(content, { password, prompt = () => { }, zipOptions = { useWebWorkers: true }, noBlobURL, entries, pagePath = "", excludedPaths } = {}) {
+async function extract(content, { password, prompt = () => { }, zipOptions = { useWebWorkers: true }, noBlobURL, entries, pagePath = "", excludedPaths, aliases } = {}) {
 	const KNOWN_MIMETYPES = {
 		"gif": "image/gif",
 		"jpg": "image/jpeg",
@@ -89,6 +89,20 @@ async function extract(content, { password, prompt = () => { }, zipOptions = { u
 		zipReader = new zip.ZipReader(reader);
 		entries = await zipReader.getEntries();
 	}
+	if (aliases) {
+		const allEntries = entries;
+		entries = entries.map(entry => {
+			const canonicalFilename = aliases[entry.filename];
+			const canonicalEntry = canonicalFilename && allEntries.find(otherEntry => otherEntry.filename == canonicalFilename);
+			return canonicalEntry ? {
+				filename: entry.filename,
+				comment: canonicalEntry.comment,
+				encrypted: canonicalEntry.encrypted,
+				uncompressedSize: canonicalEntry.uncompressedSize,
+				getData: (writer, options) => canonicalEntry.getData(writer, options)
+			} : entry;
+		});
+	}
 	if (pagePath) {
 		entries = entries.filter(entry => entry.filename.startsWith(pagePath));
 	} else if (excludedPaths) {

package/vendor/html-srcset-parser.js

@@ -41,7 +41,8 @@
  */
 
 export {
-	process
+	process,
+	serialize
 };
 
 // 1. Let input be the value passed to this algorithm.
@@ -286,7 +287,7 @@ function process(input) {
 			if (regexNonNegativeInteger.test(value) && (lastChar === "w")) {
 
 				// If width and density are not both absent, then let error be yes.
-				if (w || d) { pError = true; }
+				if (w || d !== undefined) { pError = true; }
 
 				// Apply the rules for parsing non-negative integers to the descriptor.
 				// If the result is zero, let error be yes.
@@ -298,8 +299,8 @@ function process(input) {
 			} else if (regexFloatingPoint.test(value) && (lastChar === "x")) {
 
 				// If width, density and future-compat-h are not all absent, then let error
-				// be yes.
-				if (w || d || h) { pError = true; }
+				// be yes. (d is compared with undefined: the spec allows a density of zero.)
+				if (w || d !== undefined || h) { pError = true; }
 
 				// Apply the rules for parsing floating-point number values to the descriptor.
 				// If the result is less than zero, let error be yes. Otherwise, let density
@@ -311,7 +312,7 @@ function process(input) {
 			} else if (regexNonNegativeInteger.test(value) && (lastChar === "h")) {
 
 				// If height and density are not both absent, then let error be yes.
-				if (h || d) { pError = true; }
+				if (h || d !== undefined) { pError = true; }
 
 				// Apply the rules for parsing non-negative integers to the descriptor.
 				// If the result is zero, let error be yes. Otherwise, let future-compat-h
@@ -325,15 +326,34 @@ function process(input) {
 		// 15. If error is still no, then append a new image source to candidates whose
 		// URL is url, associated with a width width if not absent and a pixel
 		// density density if not absent. Otherwise, there is a parse error.
-		if (!pError) {
-			candidate.url = url;
+		candidate.url = url;
+		if (pError) {
+			// (The spec drops the candidate on a parse error. This parser is used to rewrite srcset
+			// attributes rather than to select an image, so the descriptors are kept verbatim
+			// instead: dropping the candidate would lose the URL from the rewritten attribute.)
+			candidate.descriptors = descriptors.slice();
+		} else {
 			if (w) { candidate.w = w; }
-			if (d) { candidate.d = d; }
+			if (d !== undefined) { candidate.d = d; }
 			if (h) { candidate.h = h; }
-			candidates.push(candidate);
-		} else if (console && console.log) {  // eslint-disable-line no-console
-			console.log("Invalid srcset descriptor found in \"" + input + "\" at \"" + desc + "\"."); // eslint-disable-line no-console
 		}
+		candidates.push(candidate);
 	} // (close parseDescriptors fn)
 
+}
+
+function serialize(srcset) {
+	return srcset.map(function (candidate) {
+		const descriptors = candidate.descriptors ? candidate.descriptors.slice() : [];
+		if (candidate.w) {
+			descriptors.push(candidate.w + "w");
+		}
+		if (candidate.h) {
+			descriptors.push(candidate.h + "h");
+		}
+		if (candidate.d !== undefined) {
+			descriptors.push(candidate.d + "x");
+		}
+		return [candidate.url].concat(descriptors).join(" ");
+	}).join(", ");
 }