single-file-core 1.0.48 → 1.0.49

package/modules/html-minifier.js

@@ -68,7 +68,7 @@ const booleanAttributes = [
 	"visible"
 ];
 
-const noWhitespaceCollapseElements = ["script", "style", "pre", "textarea"];
+const noWhitespaceCollapseElements = ["SCRIPT", "STYLE", "PRE", "TEXTAREA"];
 
 // Source: https://www.w3.org/TR/html4/sgml/dtd.html#events (Generic Attributes)
 const safeToRemoveAttrs = [
@@ -90,10 +90,10 @@ const safeToRemoveAttrs = [
 ];
 
 const redundantAttributes = {
-	"form": {
+	"FORM": {
 		"method": "get"
 	},
-	"script": {
+	"SCRIPT": {
 		"language": "javascript",
 		"type": "text/javascript",
 		// Remove attribute if the function returns false
@@ -103,11 +103,11 @@ const redundantAttributes = {
 			return !node.getAttribute("src");
 		}
 	},
-	"style": {
+	"STYLE": {
 		"media": "all",
 		"type": "text/css"
 	},
-	"link": {
+	"LINK": {
 		"media": "all"
 	}
 };
@@ -128,7 +128,7 @@ const modules = [
 	removeEmptyAttributes,
 	removeRedundantAttributes,
 	compressJSONLD,
-	node => mergeElements(node, "style", (node, previousSibling) => node.parentElement && node.parentElement.tagName == "HEAD" && node.media == previousSibling.media && node.title == previousSibling.title)
+	node => mergeElements(node, "style", (node, previousSibling) => node.parentElement && getTagName(node.parentElement) == "HEAD" && node.media == previousSibling.media && node.title == previousSibling.title)
 ];
 
 export {
@@ -169,7 +169,7 @@ function mergeTextNodes(node) {
 }
 
 function mergeElements(node, tagName, acceptMerge) {
-	if (node.nodeType == Node_ELEMENT_NODE && node.tagName.toLowerCase() == tagName.toLowerCase()) {
+	if (node.nodeType == Node_ELEMENT_NODE && getTagName(node) == tagName.toUpperCase()) {
 		let previousSibling = node.previousSibling;
 		const previousSiblings = [];
 		while (previousSibling && previousSibling.nodeType == Node_TEXT_NODE && !previousSibling.textContent.trim()) {
@@ -203,15 +203,15 @@ function collapseWhitespace(node, options) {
 }
 
 function getWhiteSpace(node) {
-	return node.parentElement && node.parentElement.tagName == "HEAD" ? "\n" : " ";
+	return node.parentElement && getTagName(node.parentElement) == "HEAD" ? "\n" : " ";
 }
 
 function noWhitespaceCollapse(element) {
-	return element && !noWhitespaceCollapseElements.includes(element.tagName.toLowerCase());
+	return element && !noWhitespaceCollapseElements.includes(getTagName(element));
 }
 
 function removeComments(node) {
-	if (node.nodeType == Node_COMMENT_NODE && node.parentElement.tagName != "HTML") {
+	if (node.nodeType == Node_COMMENT_NODE && getTagName(node.parentElement) != "HTML") {
 		return !node.textContent.toLowerCase().trim().startsWith("[if");
 	}
 }
@@ -231,7 +231,7 @@ function removeEmptyAttributes(node) {
 
 function removeRedundantAttributes(node) {
 	if (node.nodeType == Node_ELEMENT_NODE) {
-		const tagRedundantAttributes = redundantAttributes[node.tagName.toLowerCase()];
+		const tagRedundantAttributes = redundantAttributes[getTagName(node)];
 		if (tagRedundantAttributes) {
 			Object.keys(tagRedundantAttributes).forEach(redundantAttributeName => {
 				const tagRedundantAttributeValue = tagRedundantAttributes[redundantAttributeName];
@@ -244,7 +244,7 @@ function removeRedundantAttributes(node) {
 }
 
 function compressJSONLD(node) {
-	if (node.nodeType == Node_ELEMENT_NODE && node.tagName == "SCRIPT" && node.type == "application/ld+json" && node.textContent.trim()) {
+	if (node.nodeType == Node_ELEMENT_NODE && getTagName(node) == "SCRIPT" && node.type == "application/ld+json" && node.textContent.trim()) {
 		try {
 			node.textContent = JSON.stringify(JSON.parse(node.textContent));
 		} catch (error) {
@@ -259,4 +259,8 @@ function removeEmptyInlineElements(doc) {
 			element.remove();
 		}
 	});
+}
+
+function getTagName(element) {
+	return  element.tagName && element.tagName.toUpperCase();
 }

package/modules/html-serializer.js

@@ -21,7 +21,7 @@
  *   Source.
  */
 
-const SELF_CLOSED_TAG_NAMES = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr"];
+const SELF_CLOSED_TAG_NAMES = ["AREA", "BASE", "BR", "COL", "COMMAND", "EMBED", "HR", "IMG", "INPUT", "KEYGEN", "LINK", "META", "PARAM", "SOURCE", "TRACK", "WBR"];
 
 const Node_ELEMENT_NODE = 1;
 const Node_TEXT_NODE = 3;
@@ -29,31 +29,31 @@ const Node_COMMENT_NODE = 8;
 
 // see https://www.w3.org/TR/html5/syntax.html#optional-tags
 const OMITTED_START_TAGS = [
-	{ tagName: "head", accept: element => !element.childNodes.length || element.childNodes[0].nodeType == Node_ELEMENT_NODE },
-	{ tagName: "body", accept: element => !element.childNodes.length }
+	{ tagName: "HEAD", accept: element => !element.childNodes.length || element.childNodes[0].nodeType == Node_ELEMENT_NODE },
+	{ tagName: "BODY", accept: element => !element.childNodes.length }
 ];
 const OMITTED_END_TAGS = [
-	{ tagName: "html", accept: next => !next || next.nodeType != Node_COMMENT_NODE },
-	{ tagName: "head", accept: next => !next || (next.nodeType != Node_COMMENT_NODE && (next.nodeType != Node_TEXT_NODE || !startsWithSpaceChar(next.textContent))) },
-	{ tagName: "body", accept: next => !next || next.nodeType != Node_COMMENT_NODE },
-	{ tagName: "li", accept: (next, element) => (!next && element.parentElement && (element.parentElement.tagName == "UL" || element.parentElement.tagName == "OL")) || (next && ["LI"].includes(next.tagName)) },
-	{ tagName: "dt", accept: next => !next || ["DT", "DD"].includes(next.tagName) },
-	{ tagName: "p", accept: next => next && ["ADDRESS", "ARTICLE", "ASIDE", "BLOCKQUOTE", "DETAILS", "DIV", "DL", "FIELDSET", "FIGCAPTION", "FIGURE", "FOOTER", "FORM", "H1", "H2", "H3", "H4", "H5", "H6", "HEADER", "HR", "MAIN", "NAV", "OL", "P", "PRE", "SECTION", "TABLE", "UL"].includes(next.tagName) },
-	{ tagName: "dd", accept: next => !next || ["DT", "DD"].includes(next.tagName) },
-	{ tagName: "rt", accept: next => !next || ["RT", "RP"].includes(next.tagName) },
-	{ tagName: "rp", accept: next => !next || ["RT", "RP"].includes(next.tagName) },
-	{ tagName: "optgroup", accept: next => !next || ["OPTGROUP"].includes(next.tagName) },
-	{ tagName: "option", accept: next => !next || ["OPTION", "OPTGROUP"].includes(next.tagName) },
-	{ tagName: "colgroup", accept: next => !next || (next.nodeType != Node_COMMENT_NODE && (next.nodeType != Node_TEXT_NODE || !startsWithSpaceChar(next.textContent))) },
-	{ tagName: "caption", accept: next => !next || (next.nodeType != Node_COMMENT_NODE && (next.nodeType != Node_TEXT_NODE || !startsWithSpaceChar(next.textContent))) },
-	{ tagName: "thead", accept: next => !next || ["TBODY", "TFOOT"].includes(next.tagName) },
-	{ tagName: "tbody", accept: next => !next || ["TBODY", "TFOOT"].includes(next.tagName) },
-	{ tagName: "tfoot", accept: next => !next },
-	{ tagName: "tr", accept: next => !next || ["TR"].includes(next.tagName) },
-	{ tagName: "td", accept: next => !next || ["TD", "TH"].includes(next.tagName) },
-	{ tagName: "th", accept: next => !next || ["TD", "TH"].includes(next.tagName) }
+	{ tagName: "HTML", accept: next => !next || next.nodeType != Node_COMMENT_NODE },
+	{ tagName: "HEAD", accept: next => !next || (next.nodeType != Node_COMMENT_NODE && (next.nodeType != Node_TEXT_NODE || !startsWithSpaceChar(next.textContent))) },
+	{ tagName: "BODY", accept: next => !next || next.nodeType != Node_COMMENT_NODE },
+	{ tagName: "LI", accept: (next, element) => (!next && element.parentElement && (getTagName(element.parentElement) == "UL" || getTagName(element.parentElement) == "OL")) || (next && ["LI"].includes(getTagName(next))) },
+	{ tagName: "DT", accept: next => !next || ["DT", "DD"].includes(getTagName(next)) },
+	{ tagName: "P", accept: next => next && ["ADDRESS", "ARTICLE", "ASIDE", "BLOCKQUOTE", "DETAILS", "DIV", "DL", "FIELDSET", "FIGCAPTION", "FIGURE", "FOOTER", "FORM", "H1", "H2", "H3", "H4", "H5", "H6", "HEADER", "HR", "MAIN", "NAV", "OL", "P", "PRE", "SECTION", "TABLE", "UL"].includes(getTagName(next)) },
+	{ tagName: "DD", accept: next => !next || ["DT", "DD"].includes(getTagName(next)) },
+	{ tagName: "RT", accept: next => !next || ["RT", "RP"].includes(getTagName(next)) },
+	{ tagName: "RP", accept: next => !next || ["RT", "RP"].includes(getTagName(next)) },
+	{ tagName: "OPTGROUP", accept: next => !next || ["OPTGROUP"].includes(getTagName(next)) },
+	{ tagName: "OPTION", accept: next => !next || ["OPTION", "OPTGROUP"].includes(getTagName(next)) },
+	{ tagName: "COLGROUP", accept: next => !next || (next.nodeType != Node_COMMENT_NODE && (next.nodeType != Node_TEXT_NODE || !startsWithSpaceChar(next.textContent))) },
+	{ tagName: "CAPTION", accept: next => !next || (next.nodeType != Node_COMMENT_NODE && (next.nodeType != Node_TEXT_NODE || !startsWithSpaceChar(next.textContent))) },
+	{ tagName: "THEAD", accept: next => !next || ["TBODY", "TFOOT"].includes(getTagName(next)) },
+	{ tagName: "TBODY", accept: next => !next || ["TBODY", "TFOOT"].includes(getTagName(next)) },
+	{ tagName: "TFOOT", accept: next => !next },
+	{ tagName: "TR", accept: next => !next || ["TR"].includes(getTagName(next)) },
+	{ tagName: "TD", accept: next => !next || ["TD", "TH"].includes(getTagName(next)) },
+	{ tagName: "TH", accept: next => !next || ["TD", "TH"].includes(getTagName(next)) }
 ];
-const TEXT_NODE_TAGS = ["style", "script", "xmp", "iframe", "noembed", "noframes", "plaintext", "noscript"];
+const TEXT_NODE_TAGS = ["STYLE", "SCRIPT", "XMP", "IFRAME", "NOEMBED", "NOFRAMES", "PLAINTEXT", "NOSCRIPT"];
 
 export {
 	process
@@ -91,10 +91,10 @@ function serializeTextNode(textNode) {
 	const parentNode = textNode.parentNode;
 	let parentTagName;
 	if (parentNode && parentNode.nodeType == Node_ELEMENT_NODE) {
-		parentTagName = parentNode.tagName.toLowerCase();
+		parentTagName = getTagName(parentNode);
 	}
 	if (!parentTagName || TEXT_NODE_TAGS.includes(parentTagName)) {
-		if (parentTagName == "script" || parentTagName == "style") {
+		if (parentTagName == "SCRIPT" || parentTagName == "STYLE") {
 			return textNode.textContent.replace(/<\//gi, "<\\/").replace(/\/>/gi, "\\/>");
 		}
 		return textNode.textContent;
@@ -108,22 +108,22 @@ function serializeCommentNode(commentNode) {
 }
 
 function serializeElement(element, compressHTML, isSVG) {
-	const tagName = element.tagName.toLowerCase();
-	const omittedStartTag = compressHTML && OMITTED_START_TAGS.find(omittedStartTag => tagName == omittedStartTag.tagName && omittedStartTag.accept(element));
+	const tagName = getTagName(element);
+	const omittedStartTag = compressHTML && OMITTED_START_TAGS.find(omittedStartTag => tagName == getTagName(omittedStartTag) && omittedStartTag.accept(element));
 	let content = "";
 	if (!omittedStartTag || element.attributes.length) {
-		content = "<" + tagName;
+		content = "<" + tagName.toLowerCase();
 		Array.from(element.attributes).forEach(attribute => content += serializeAttribute(attribute, element, compressHTML));
 		content += ">";
 	}
-	if (element.tagName == "TEMPLATE" && !element.childNodes.length) {
+	if (tagName == "TEMPLATE" && !element.childNodes.length) {
 		content += element.innerHTML;
 	} else {
 		Array.from(element.childNodes).forEach(childNode => content += serialize(childNode, compressHTML, isSVG || tagName == "svg"));
 	}
-	const omittedEndTag = compressHTML && OMITTED_END_TAGS.find(omittedEndTag => tagName == omittedEndTag.tagName && omittedEndTag.accept(element.nextSibling, element));
+	const omittedEndTag = compressHTML && OMITTED_END_TAGS.find(omittedEndTag => tagName == getTagName(omittedEndTag) && omittedEndTag.accept(element.nextSibling, element));
 	if (isSVG || (!omittedEndTag && !SELF_CLOSED_TAG_NAMES.includes(tagName))) {
-		content += "</" + tagName + ">";
+		content += "</" + tagName.toLowerCase() + ">";
 	}
 	return content;
 }
@@ -177,4 +177,8 @@ function serializeAttribute(attribute, element, compressHTML) {
 
 function startsWithSpaceChar(textContent) {
 	return Boolean(textContent.match(/^[ \t\n\f\r]/));
+}
+
+function getTagName(element) {
+	return  element.tagName && element.tagName.toUpperCase();
 }

package/package.json

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

package/processors/lazy/content/content-lazy-loader.js

@@ -98,7 +98,8 @@ function triggerLazyLoading(options) {
 						mutation.target.setAttribute(helper.LAZY_SRC_ATTRIBUTE_NAME, mutation.target.src);
 						mutation.target.addEventListener("load", onResourceLoad);
 					}
-					if (mutation.attributeName == "src" || mutation.attributeName == "srcset" || mutation.target.tagName == "SOURCE") {
+					if (mutation.attributeName == "src" || mutation.attributeName == "srcset" || 
+						(mutation.target.tagName && mutation.target.tagName.toUpperCase() == "SOURCE")) {
 						return !mutation.target.classList || !mutation.target.classList.contains(helper.SINGLE_FILE_UI_ELEMENT_CLASS);
 					}
 				});

package/single-file-core.js

@@ -629,8 +629,8 @@ class Processor {
 
 		function canHideNode(node) {
 			if (node.nodeType == 1) {
-				const tagName = node.tagName && node.tagName.toLowerCase();
-				return tagName != "svg" && tagName != "style" && tagName != "link";
+				const tagName = node.tagName && node.tagName.toUpperCase();
+				return tagName != "SVG" && tagName != "STYLE" && tagName != "LINK";
 			}
 		}
 	}
@@ -639,7 +639,7 @@ class Processor {
 		if (this.options.posters) {
 			this.doc.querySelectorAll("video, video > source").forEach(element => {
 				let videoElement;
-				if (element.tagName == "VIDEO") {
+				if (element.tagName.toUpperCase() == "VIDEO") {
 					videoElement = element;
 				} else {
 					videoElement = element.parentElement;
@@ -919,7 +919,7 @@ class Processor {
 	resolveHrefs() {
 		this.doc.querySelectorAll("a[href], area[href], link[href]").forEach(element => {
 			const href = element.getAttribute("href").trim();
-			if (element.tagName == "LINK" && element.rel.includes("stylesheet")) {
+			if (element.tagName.toUpperCase() == "LINK" && element.rel.includes("stylesheet")) {
 				if (this.options.saveOriginalURLs && !isDataURL(href)) {
 					element.setAttribute("data-sf-original-href", href);
 				}
@@ -950,7 +950,7 @@ class Processor {
 		await Promise.all(
 			Array.from(this.doc.querySelectorAll("video[src], video > source[src]")).map(async element => {
 				let videoElement;
-				if (element.tagName == "VIDEO") {
+				if (element.tagName.toUpperCase() == "VIDEO") {
 					videoElement = element;
 				} else {
 					videoElement = element.parentElement;
@@ -1022,7 +1022,7 @@ class Processor {
 					mediaText,
 					scoped
 				};
-				if (element.tagName == "LINK" && element.charset) {
+				if (element.tagName.toUpperCase() == "LINK" && element.charset) {
 					options.charset = element.charset;
 				}
 				await processElement(element, stylesheetInfo, this.stylesheets, this.baseURI, options, this.workStyleElement);
@@ -1050,7 +1050,7 @@ class Processor {
 			let stylesheet;
 			stylesheets.set(element, stylesheetInfo);
 			if (!options.blockStylesheets) {
-				if (element.tagName == "LINK") {
+				if (element.tagName.toUpperCase() == "LINK") {
 					stylesheet = await ProcessorHelper.resolveLinkStylesheetURLs(element.href, baseURI, options, workStyleElement);
 				} else {
 					stylesheet = cssTree.parse(element.textContent, { context: "stylesheet", parseCustomProperty: true });
@@ -1076,7 +1076,7 @@ class Processor {
 			const frameElements = Array.from(this.doc.querySelectorAll("iframe, frame, object[type=\"text/html\"][data]"));
 			await Promise.all(
 				frameElements.map(async frameElement => {
-					if (frameElement.tagName == "OBJECT") {
+					if (frameElement.tagName.toUpperCase() == "OBJECT") {
 						frameElement.setAttribute("data", "data:text/html,");
 					} else {
 						const src = frameElement.getAttribute("src");
@@ -1305,10 +1305,10 @@ class Processor {
 									sandbox += " allow-scripts allow-same-origin";
 								}
 								frameElement.setAttribute("sandbox", sandbox);
-								if (frameElement.tagName == "OBJECT") {
+								if (frameElement.tagName.toUpperCase() == "OBJECT") {
 									frameElement.setAttribute("data", "data:text/html," + pageData.content);
 								} else {
-									if (frameElement.tagName == "FRAME") {
+									if (frameElement.tagName.toUpperCase() == "FRAME") {
 										frameElement.setAttribute("src", "data:text/html," + pageData.content.replace(/%/g, "%25").replace(/#/g, "%23"));
 									} else {
 										frameElement.setAttribute("srcdoc", pageData.content);
@@ -1766,7 +1766,9 @@ class ProcessorHelper {
 									// ignored
 								}
 								if (testValidURL(resourceURL)) {
-									let { content, indexResource, duplicate } = await batchRequest.addURL(resourceURL, { asBinary: true, expectedType, groupDuplicates: options.groupDuplicateImages && resourceElement.tagName == "IMG" && attributeName == "src" });
+									let { content, indexResource, duplicate } = await batchRequest.addURL(
+										resourceURL, 
+										{ asBinary: true, expectedType, groupDuplicates: options.groupDuplicateImages && resourceElement.tagName.toUpperCase() == "IMG" && attributeName == "src" });
 									if (originURL) {
 										if (content == util.EMPTY_RESOURCE) {
 											try {

package/single-file-helper.js

@@ -191,7 +191,7 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 				computedStyle = getComputedStyle(win, element);
 				if (element instanceof win.HTMLElement) {
 					if (options.removeHiddenElements) {
-						elementKept = ((ascendantHidden || element.closest("html > head")) && KEPT_TAG_NAMES.includes(element.tagName)) || element.closest("details");
+						elementKept = ((ascendantHidden || element.closest("html > head")) && KEPT_TAG_NAMES.includes(element.tagName.toUpperCase())) || element.closest("details");
 						if (!elementKept) {
 							elementHidden = ascendantHidden || testHiddenElement(element, computedStyle);
 							if (elementHidden) {
@@ -253,7 +253,8 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 }
 
 function getResourcesInfo(win, doc, element, options, data, elementHidden, computedStyle) {
-	if (element.tagName == "CANVAS") {
+	const tagName = element.tagName && element.tagName.toUpperCase();
+	if (tagName == "CANVAS") {
 		try {
 			data.canvases.push({ dataURI: element.toDataURL("image/png", "") });
 			element.setAttribute(CANVAS_ATTRIBUTE_NAME, data.canvases.length - 1);
@@ -262,7 +263,7 @@ function getResourcesInfo(win, doc, element, options, data, elementHidden, compu
 			// ignored
 		}
 	}
-	if (element.tagName == "IMG") {
+	if (tagName == "IMG") {
 		const imageData = {
 			currentSrc: elementHidden ?
 				EMPTY_RESOURCE :
@@ -288,7 +289,7 @@ function getResourcesInfo(win, doc, element, options, data, elementHidden, compu
 			}
 		}
 	}
-	if (element.tagName == "VIDEO") {
+	if (tagName == "VIDEO") {
 		const src = element.currentSrc;
 		if (src && !src.startsWith("blob:") && !src.startsWith("data:")) {
 			const computedStyle = getComputedStyle(win, element.parentNode);
@@ -318,13 +319,13 @@ function getResourcesInfo(win, doc, element, options, data, elementHidden, compu
 			}
 		}
 	}
-	if (element.tagName == "IFRAME") {
+	if (tagName == "IFRAME") {
 		if (elementHidden && options.removeHiddenElements) {
 			element.setAttribute(HIDDEN_FRAME_ATTRIBUTE_NAME, "");
 			data.markedElements.push(element);
 		}
 	}
-	if (element.tagName == "INPUT") {
+	if (tagName == "INPUT") {
 		if (element.type != "password") {
 			element.setAttribute(INPUT_VALUE_ATTRIBUTE_NAME, element.value);
 			data.markedElements.push(element);
@@ -334,11 +335,11 @@ function getResourcesInfo(win, doc, element, options, data, elementHidden, compu
 			data.markedElements.push(element);
 		}
 	}
-	if (element.tagName == "TEXTAREA") {
+	if (tagName == "TEXTAREA") {
 		element.setAttribute(INPUT_VALUE_ATTRIBUTE_NAME, element.value);
 		data.markedElements.push(element);
 	}
-	if (element.tagName == "SELECT") {
+	if (tagName == "SELECT") {
 		element.querySelectorAll("option").forEach(option => {
 			if (option.selected) {
 				option.setAttribute(INPUT_VALUE_ATTRIBUTE_NAME, "");
@@ -346,7 +347,7 @@ function getResourcesInfo(win, doc, element, options, data, elementHidden, compu
 			}
 		});
 	}
-	if (element.tagName == "SCRIPT") {
+	if (tagName == "SCRIPT") {
 		if (element.async && element.getAttribute("async") != "" && element.getAttribute("async") != "async") {
 			element.setAttribute(ASYNC_SCRIPT_ATTRIBUTE_NAME, "");
 			data.markedElements.push(element);