single-file-core 1.2.12 → 1.2.14

package/core/helper.js

@@ -203,12 +203,12 @@ function preProcessDoc(doc, win, options) {
 
 function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map(), canvases: [], images: [], posters: [], videos: [], shadowRoots: [], markedElements: [] }, ascendantHidden) {
 	if (element.childNodes) {
-		const elements = Array.from(element.childNodes).filter(node => (node instanceof win.HTMLElement) || (node instanceof win.SVGElement));
+		const elements = Array.from(element.childNodes).filter(node => (node instanceof win.HTMLElement) || (node instanceof win.SVGElement) || (node instanceof globalThis.HTMLElement) || (node instanceof globalThis.SVGElement));
 		elements.forEach(element => {
 			let elementHidden, elementKept, computedStyle;
 			if (!options.autoSaveExternalSave && (options.removeHiddenElements || options.removeUnusedFonts || options.compressHTML)) {
 				computedStyle = getComputedStyle(win, element);
-				if (element instanceof win.HTMLElement) {
+				if ((element instanceof win.HTMLElement) || (element instanceof globalThis.HTMLElement)) {
 					if (options.removeHiddenElements) {
 						elementKept = ((ascendantHidden || element.closest("html > head")) && KEPT_TAG_NAMES.includes(element.tagName.toUpperCase())) || element.closest("details");
 						if (!elementKept) {
@@ -237,7 +237,7 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 				}
 			}
 			getResourcesInfo(win, doc, element, options, data, elementHidden, computedStyle);
-			const shadowRoot = !(element instanceof win.SVGElement) && getShadowRoot(element);
+			const shadowRoot = !((element instanceof win.SVGElement) || (element instanceof globalThis.SVGElement)) && getShadowRoot(element);
 			if (shadowRoot && !element.classList.contains(SINGLE_FILE_UI_ELEMENT_CLASS)) {
 				const shadowRootInfo = {};
 				element.setAttribute(SHADOW_ROOT_ATTRIBUTE_NAME, data.shadowRoots.length);
@@ -496,7 +496,9 @@ function getStylesheetsData(doc) {
 				doc.body.appendChild(tempStyleElement);
 				const stylesheet = tempStyleElement.sheet;
 				tempStyleElement.remove();
-				if (!stylesheet || stylesheet.cssRules.length != styleElement.sheet.cssRules.length) {
+				const textContentStylesheet = Array.from(stylesheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
+				const sheetStylesheet = Array.from(styleElement.sheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
+				if (!stylesheet || textContentStylesheet != sheetStylesheet) {
 					styleElement.setAttribute(STYLESHEET_ATTRIBUTE_NAME, styleIndex);
 					contents[styleIndex] = Array.from(styleElement.sheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
 				}

package/core/index.js

@@ -569,7 +569,7 @@ class Processor {
 			this.stats.set("processed", "HTML bytes", contentSize);
 			this.stats.add("discarded", "HTML bytes", size - contentSize);
 		}
-		const filename = await util.formatFilename(content, this.options);
+		const filename = await util.formatFilename(content, this.doc, this.options);
 		const matchTitle = this.baseURI.match(/([^/]*)\/?(\.html?.*)$/) || this.baseURI.match(/\/\/([^/]*)\/?$/);
 		const additionalData = this.processorHelper.getAdditionalPageData(this.doc, content, this.resources);
 		const pageData = Object.assign({
@@ -588,9 +588,7 @@ class Processor {
 	}
 
 	preProcessPage() {
-		if (this.options.win) {
-			this.doc.body.querySelectorAll(":not(svg) title, meta, link[href][rel*=\"icon\"]").forEach(element => element instanceof this.options.win.HTMLElement && this.doc.head.appendChild(element));
-		}
+		this.doc.body.querySelectorAll(":not(svg) title, meta, link[href][rel*=\"icon\"]").forEach(element => ((element instanceof (this.options.win && this.options.win.HTMLElement)) || (element instanceof globalThis.HTMLElement)) && this.doc.head.appendChild(element));
 		if (this.options.images && !this.options.saveRawPage) {
 			this.doc.querySelectorAll("img[" + util.IMAGE_ATTRIBUTE_NAME + "]").forEach(imgElement => {
 				const attributeValue = imgElement.getAttribute(util.IMAGE_ATTRIBUTE_NAME);
@@ -1429,7 +1427,7 @@ class Processor {
 			publisher: publisherElement && publisherElement.content ? publisherElement.content.trim() : "",
 			heading: headingElement && headingElement.textContent ? headingElement.textContent.trim() : ""
 		};
-		this.options.infobarContent = await util.evalTemplate(this.options.infobarTemplate, this.options, null, true);
+		this.options.infobarContent = await util.evalTemplate(this.options.infobarTemplate, this.options, null, this.doc, true);
 	}
 }
 

package/core/util.js

@@ -130,11 +130,11 @@ function getInstance(utilOptions) {
 		getContentSize(content) {
 			return new Blob([content]).size;
 		},
-		formatFilename(content, options) {
-			return modules.templateFormatter.formatFilename(content, options, this);
+		formatFilename(content, doc, options) {
+			return modules.templateFormatter.formatFilename(content, doc, options, this);
 		},
-		evalTemplate(template, options, content, dontReplaceSlash) {
-			return modules.templateFormatter.evalTemplate(template, options, this, content, dontReplaceSlash);
+		async evalTemplate(template, options, content, doc, dontReplaceSlash) {
+			return modules.templateFormatter.evalTemplate(template, options, this, content, doc, dontReplaceSlash);
 		},
 		minifyHTML(doc, options) {
 			return modules.htmlMinifier.process(doc, options);
@@ -313,7 +313,7 @@ function getInstance(utilOptions) {
 async function getFetchResponse(resourceURL, options, data, charset, contentType) {
 	if (data) {
 		if (options.asBinary) {
-			if (options.inline)	{
+			if (options.inline) {
 				const reader = new FileReader();
 				reader.readAsDataURL(new Blob([data], { type: contentType + (options.charset ? ";charset=" + options.charset : "") }));
 				data = await new Promise((resolve, reject) => {