single-file-core 1.2.40 → 1.2.43

package/core/helper.js

@@ -61,6 +61,7 @@ const INVALID_ELEMENT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "invalid-e
 const ASYNC_SCRIPT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "async-script";
 const FLOW_ELEMENTS_SELECTOR = "*:not(base):not(link):not(meta):not(noscript):not(script):not(style):not(template):not(title)";
 const KEPT_TAG_NAMES = ["NOSCRIPT", "DISABLED-NOSCRIPT", "META", "LINK", "STYLE", "TITLE", "TEMPLATE", "SOURCE", "OBJECT", "SCRIPT", "HEAD", "BODY"];
+const IGNORED_TAG_NAMES = ["SCRIPT", "NOSCRIPT", "META", "LINK", "TEMPLATE"];
 const REGEXP_SIMPLE_QUOTES_STRING = /^'(.*?)'$/;
 const REGEXP_DOUBLE_QUOTES_STRING = /^"(.*?)"$/;
 const FONT_WEIGHTS = {
@@ -219,7 +220,7 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 						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) {
+							if (elementHidden && !IGNORED_TAG_NAMES.includes(element.tagName.toUpperCase())) {
 								element.setAttribute(HIDDEN_CONTENT_ATTRIBUTE_NAME, "");
 								data.markedElements.push(element);
 							}

package/core/index.js

@@ -503,7 +503,7 @@ class Processor {
 				const info = this.doc.documentElement.firstChild.textContent.split("\n");
 				try {
 					const [, , url, saveDate] = info;
-					infobarURL = url.split("url: ")[1];
+					infobarURL = url.split("url: ")[1].trim();
 					infobarSaveDate = saveDate.split("saved date: ")[1];
 					firstComment.remove();
 				} catch (error) {
@@ -651,34 +651,33 @@ class Processor {
 	}
 
 	saveFilenameTemplateData() {
-		const existingScript = this.doc.querySelector("script[" + SCRIPT_OPTIONS + "][type=\"application/json\"]");
-		if (existingScript) {
-			existingScript.remove();
-		}
-		const optionsElement = this.doc.createElement("script");
-		optionsElement.type = "application/json";
-		optionsElement.setAttribute(SCRIPT_OPTIONS, "");
-		optionsElement.textContent = JSON.stringify({
-			saveUrl: this.options.url,
-			saveDate: this.options.saveDate.getTime(),
-			visitDate: this.options.visitDate.getTime(),
-			filenameTemplate: this.options.filenameTemplate,
-			filenameReplacedCharacters: this.options.filenameReplacedCharacters,
-			filenameReplacementCharacter: this.options.filenameReplacementCharacter,
-			filenameMaxLengthUnit: this.options.filenameMaxLengthUnit,
-			filenameMaxLength: this.options.filenameMaxLength,
-			replaceEmojisInFilename: this.options.replaceEmojisInFilename,
-			compressContent: this.options.compressContent,
-			selfExtractingArchive: this.options.selfExtractingArchive,
-			extractDataFromPage: this.options.extractDataFromPage,
-			referrer: this.options.referrer,
-			title: this.options.title,
-			info: this.options.info
-		});
-		if (this.doc.body.firstChild) {
-			this.doc.body.insertBefore(optionsElement, this.doc.body.firstChild);
-		} else {
-			this.doc.body.appendChild(optionsElement);
+		const optionsElement = this.doc.querySelector("script[" + SCRIPT_OPTIONS + "][type=\"application/json\"]");
+		if (!optionsElement) {
+			const optionsElement = this.doc.createElement("script");
+			optionsElement.type = "application/json";
+			optionsElement.setAttribute(SCRIPT_OPTIONS, "");
+			optionsElement.textContent = JSON.stringify({
+				saveUrl: this.options.url,
+				saveDate: this.options.saveDate.getTime(),
+				visitDate: this.options.visitDate.getTime(),
+				filenameTemplate: this.options.filenameTemplate,
+				filenameReplacedCharacters: this.options.filenameReplacedCharacters,
+				filenameReplacementCharacter: this.options.filenameReplacementCharacter,
+				filenameMaxLengthUnit: this.options.filenameMaxLengthUnit,
+				filenameMaxLength: this.options.filenameMaxLength,
+				replaceEmojisInFilename: this.options.replaceEmojisInFilename,
+				compressContent: this.options.compressContent,
+				selfExtractingArchive: this.options.selfExtractingArchive,
+				extractDataFromPage: this.options.extractDataFromPage,
+				referrer: this.options.referrer,
+				title: this.options.title,
+				info: this.options.info
+			});
+			if (this.doc.body.firstChild) {
+				this.doc.body.insertBefore(optionsElement, this.doc.body.firstChild);
+			} else {
+				this.doc.body.appendChild(optionsElement);
+			}
 		}
 	}
 

package/package.json

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

package/vendor/zip/zip.js

@@ -1,4 +1,4 @@
-const { Array, Object, String, Number, BigInt, Math, Date, Map, Set, Response, URL, Error, Uint8Array, Uint16Array, Uint32Array, DataView, Blob, Promise, TextEncoder, TextDecoder, document, crypto, btoa, TransformStream, ReadableStream, WritableStream, CompressionStream, DecompressionStream, navigator, Worker } = typeof globalThis !== 'undefined' ? globalThis : this || self;
+const { Array, Object, String, Number, BigInt, Math, Date, Map, Set, Response, URL, Error, Uint8Array, Uint16Array, Uint32Array, DataView, Blob, Promise, TextEncoder, TextDecoder, crypto, btoa, TransformStream, ReadableStream, WritableStream, CompressionStream, DecompressionStream, navigator, Worker } = globalThis;
 
 /*
  Copyright (c) 2022 Gildas Lormeau. All rights reserved.
@@ -4940,7 +4940,7 @@ function getLength(...arrayLikes) {
  derived from this software without specific prior written permission.
 
  THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WA    RRANTIES OF MERCHANTABILITY AND
  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
  INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT