single-file-core 1.0.71 → 1.1.73

package/{single-file-core.js → core/single-file-core.js}

@@ -34,6 +34,10 @@ const Image = globalThis.Image;
 
 let util, cssTree;
 
+export { 
+	getClass
+};
+
 function getClass(...args) {
 	[util, cssTree] = args;
 	return SingleFileClass;
@@ -489,9 +493,9 @@ class Processor {
 			}
 			const infobarContent = (this.options.infobarContent || "").replace(/\\n/g, "\n").replace(/\\t/g, "\t");
 			const commentNode = this.doc.createComment(
-				"\n " + (this.options.useLegacyCommentHeader ? util.COMMENT_HEADER_LEGACY : util.COMMENT_HEADER) + 
-				" \n url: " + infobarURL + 
-				(this.options.removeSavedDate ? " " : " \n saved date: " + infobarSaveDate) + 
+				"\n " + (this.options.useLegacyCommentHeader ? util.COMMENT_HEADER_LEGACY : util.COMMENT_HEADER) +
+				" \n url: " + infobarURL +
+				(this.options.removeSavedDate ? " " : " \n saved date: " + infobarSaveDate) +
 				(infobarContent ? " \n info: " + infobarContent : "") + "\n"
 			);
 			this.doc.documentElement.insertBefore(commentNode, this.doc.documentElement.firstChild);
@@ -583,7 +587,7 @@ class Processor {
 					const imageData = this.options.images[Number(attributeValue)];
 					if (imageData) {
 						if (this.options.removeHiddenElements && (
-							(imageData.size && !imageData.size.pxWidth && !imageData.size.pxHeight) || 
+							(imageData.size && !imageData.size.pxWidth && !imageData.size.pxHeight) ||
 							imgElement.getAttribute(util.HIDDEN_CONTENT_ATTRIBUTE_NAME) == "")
 						) {
 							imgElement.setAttribute("src", util.EMPTY_RESOURCE);
@@ -626,7 +630,7 @@ class Processor {
 				}
 			});
 		}
-		if (this.options.adoptedStyleSheets.length) {
+		if (this.options.adoptedStyleSheets && this.options.adoptedStyleSheets.length) {
 			const styleElement = this.doc.createElement("style");
 			styleElement.textContent = this.options.adoptedStyleSheets.join("\n");
 			this.doc.body.appendChild(styleElement);
@@ -1194,7 +1198,7 @@ class Processor {
 					if (shadowRootData) {
 						const templateElement = doc.createElement("template");
 						templateElement.setAttribute(SHADOWROOT_ATTRIBUTE_NAME, shadowRootData.mode);
-						if (shadowRootData.adoptedStyleSheets) {
+						if (shadowRootData.adoptedStyleSheets && shadowRootData.adoptedStyleSheets.length) {
 							shadowRootData.adoptedStyleSheets.forEach(stylesheetContent => {
 								const styleElement = doc.createElement("style");
 								styleElement.textContent = stylesheetContent;
@@ -1245,13 +1249,13 @@ class Processor {
 
 	async processStylesheets() {
 		this.options.fontDeclarations = new Map();
-		await Promise.all([...this.stylesheets].map(([, stylesheetInfo]) => 
+		await Promise.all([...this.stylesheets].map(([, stylesheetInfo]) =>
 			ProcessorHelper.processStylesheet(stylesheetInfo.stylesheet.children, this.baseURI, this.options, this.cssVariables, this.batchRequest)
 		));
 	}
 
 	async processStyleAttributes() {
-		return Promise.all([...this.styles].map(([, stylesheet]) => 
+		return Promise.all([...this.styles].map(([, stylesheet]) =>
 			ProcessorHelper.processStyle(stylesheet, this.baseURI, this.options, this.cssVariables, this.batchRequest)
 		));
 	}
@@ -1854,7 +1858,7 @@ class ProcessorHelper {
 							}
 							if (testValidURL(resourceURL)) {
 								let { content, indexResource, duplicate } = await batchRequest.addURL(
-									resourceURL, 
+									resourceURL,
 									{ asBinary: true, expectedType, groupDuplicates: options.groupDuplicateImages && resourceElement.tagName.toUpperCase() == "IMG" && attributeName == "src" });
 								if (originURL) {
 									if (content == util.EMPTY_RESOURCE) {
@@ -1894,7 +1898,7 @@ class ProcessorHelper {
 												image.src = content;
 												image.onload = () => cleanupAndResolve();
 												image.onerror = () => cleanupAndResolve(true);
-	
+
 												function cleanupAndResolve(value) {
 													clearTimeout(timeoutId);
 													resolve(value);
@@ -2225,8 +2229,4 @@ class Stats {
 			Object.keys(this.data.processed).forEach(key => this.add("processed", key, pageData.stats.processed[key] || 0));
 		}
 	}
-}
-
-export { 
-	getClass
-};
+}

package/{single-file-helper.js → core/single-file-helper.js}

@@ -23,9 +23,9 @@
 
 /* global globalThis, CustomEvent */
 
-import * as cssUnescape from "./vendor/css-unescape.js";
-import * as hooksFrames from "./processors/hooks/content/content-hooks-frames.js";
-import * as infobar from "./common/infobar.js";
+import * as cssUnescape from "./../vendor/css-unescape.js";
+import * as hooksFrames from "./../processors/hooks/content/content-hooks-frames.js";
+import * as infobar from "./infobar.js";
 
 const ON_BEFORE_CAPTURE_EVENT_NAME = "single-file-on-before-capture";
 const ON_AFTER_CAPTURE_EVENT_NAME = "single-file-on-after-capture";

package/{single-file-util.js → core/single-file-util.js}

@@ -23,8 +23,8 @@
 
 /* global globalThis, URLSearchParams */
 
-import * as vendor from "./vendor/index.js";
-import * as modules from "./modules/index.js";
+import * as vendor from "./../vendor/index.js";
+import * as modules from "./../modules/index.js";
 import * as helper from "./single-file-helper.js";
 
 const DEBUG = false;

package/modules/css-fonts-alt-minifier.js

@@ -27,7 +27,7 @@ import * as cssTree from "./../vendor/css-tree.js";
 import {
 	normalizeFontFamily,
 	getFontWeight
-} from "./../single-file-helper.js";
+} from "./../core/single-file-helper.js";
 
 const helper = {
 	normalizeFontFamily,

package/modules/css-fonts-minifier.js

@@ -30,7 +30,7 @@ import {
 	flatten,
 	getFontWeight,
 	removeQuotes
-} from "./../single-file-helper.js";
+} from "./../core/single-file-helper.js";
 
 const helper = {
 	normalizeFontFamily,

package/modules/css-medias-alt-minifier.js

@@ -23,7 +23,7 @@
 
 import * as cssTree from "./../vendor/css-tree.js";
 import * as mediaQueryParser from "./../vendor/css-media-query-parser.js";
-import { flatten } from "./../single-file-helper.js";
+import { flatten } from "./../core/single-file-helper.js";
 
 const helper = {
 	flatten

package/package.json

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

package/processors/frame-tree/content/content-frame-tree.js

@@ -32,7 +32,7 @@ import {
 	serialize,
 	postProcessDoc,
 	getShadowRoot
-} from "./../../../single-file-helper.js";
+} from "./../../../core/single-file-helper.js";
 
 const helper = {
 	ON_BEFORE_CAPTURE_EVENT_NAME,

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

@@ -27,7 +27,7 @@ import * as hooksFrames from "./../../hooks/content/content-hooks-frames.js";
 import {
 	LAZY_SRC_ATTRIBUTE_NAME,
 	SINGLE_FILE_UI_ELEMENT_CLASS
-} from "./../../../single-file-helper.js";
+} from "./../../../core/single-file-helper.js";
 const helper = {
 	LAZY_SRC_ATTRIBUTE_NAME,
 	SINGLE_FILE_UI_ELEMENT_CLASS

package/single-file-bootstrap.js

@@ -32,7 +32,7 @@ import {
 	preProcessDoc,
 	postProcessDoc,
 	getShadowRoot
-} from "./single-file-helper.js";
+} from "./core/single-file-helper.js";
 
 const processors = { frameTree };
 const helper = {

package/{single-file-mini-helper.js → single-file-editor-helper.js}

@@ -22,8 +22,8 @@
  */
 
 import * as serializer from "./modules/html-serializer.js";
-import * as infobar from "./common/infobar.js";
-import { getInstance } from "./single-file-util.js";
+import * as infobar from "./core/infobar.js";
+import { getInstance } from "./core/single-file-util.js";
 
 const util = getInstance();
 const helper = {

package/single-file-infobar.js

@@ -21,4 +21,43 @@
  *   Source.
  */
 
-import "./common/content-infobar-web.js";
+/* global globalThis, window, document */
+
+import { appendInfobar, refreshInfobarInfo, extractInfobarData } from "./core/infobar.js";
+
+(globalThis => {
+
+	const browser = globalThis.browser;
+
+	if (globalThis.window == globalThis.top) {
+		if (document.readyState == "loading") {
+			document.addEventListener("DOMContentLoaded", displayIcon, false);
+		} else {
+			displayIcon();
+		}
+	}
+	if (globalThis.singlefile) {
+		globalThis.singlefile.infobar = {
+			displayIcon
+		};
+	}
+
+	async function displayIcon() {
+		let options = { displayInfobar: true };
+		const infoData = extractInfobarData(document);
+		if (infoData && infoData.saveUrl) {
+			if (browser && browser.runtime && browser.runtime.sendMessage) {
+				try {
+					options = await browser.runtime.sendMessage({ method: "tabs.getOptions", url: infoData.saveUrl });
+				} catch (error) {
+					// ignored
+				}
+			}
+			if (options.displayInfobar) {
+				appendInfobar(document, options, true);
+				refreshInfobarInfo(document, infoData);
+			}
+		}
+	}
+
+})(typeof globalThis == "object" ? globalThis : window);

package/single-file.js

@@ -26,11 +26,12 @@
 import * as processors from "./processors/index.js";
 import * as vendor from "./vendor/index.js";
 import * as modules from "./modules/index.js";
-import * as core from "./single-file-core.js";
-import * as helper from "./single-file-helper.js";
-import * as util from "./single-file-util.js";
+import * as core from "./core/single-file-core.js";
+import * as helper from "./core/single-file-helper.js";
+import * as util from "./core/single-file-util.js";
 
 let SingleFile;
+
 export {
 	init,
 	getPageData,
@@ -65,7 +66,7 @@ async function getPageData(options = {}, initOptions, doc = globalThis.document,
 			if (!options.removeFrames && frames && globalThis.frames) {
 				let frameTreePromise;
 				if (options.loadDeferredImages) {
-					frameTreePromise = new Promise(resolve => globalThis.setTimeout(() => resolve(frames.getAsync(options)), options.loadDeferredImagesBeforeFrames ? 0 : options.loadDeferredImagesMaxIdleTime));
+					frameTreePromise = new Promise(resolve => globalThis.setTimeout(() => resolve(frames.getAsync(options)), options.loadDeferredImagesBeforeFrames || !options.loadDeferredImages ? 0 : options.loadDeferredImagesMaxIdleTime));
 				} else {
 					frameTreePromise = frames.getAsync(options);
 				}

package/common/content-infobar-web.js

@@ -1,63 +0,0 @@
-/*
- * Copyright 2010-2022 Gildas Lormeau
- * contact : gildas.lormeau <at> gmail.com
- * 
- * This file is part of SingleFile.
- *
- *   The code in this file is free software: you can redistribute it and/or 
- *   modify it under the terms of the GNU Affero General Public License 
- *   (GNU AGPL) as published by the Free Software Foundation, either version 3
- *   of the License, or (at your option) any later version.
- * 
- *   The code in this file is distributed in the hope that it will be useful, 
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of 
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero 
- *   General Public License for more details.
- *
- *   As additional permission under GNU AGPL version 3 section 7, you may 
- *   distribute UNMODIFIED VERSIONS OF THIS file without the copy of the GNU 
- *   AGPL normally required by section 4, provided you include this license 
- *   notice and a URL through which recipients can access the Corresponding 
- *   Source.
- */
-
-/* global globalThis, window, document */
-
-import { appendInfobar, refreshInfobarInfo, extractInfobarData } from "./infobar.js";
-
-(globalThis => {
-
-	const browser = globalThis.browser;
-
-	if (globalThis.window == globalThis.top) {
-		if (document.readyState == "loading") {
-			document.addEventListener("DOMContentLoaded", displayIcon, false);
-		} else {
-			displayIcon();
-		}
-	}
-	if (globalThis.singlefile) {
-		globalThis.singlefile.infobar = {
-			displayIcon
-		};
-	}
-
-	async function displayIcon() {
-		let options = { displayInfobar: true };
-		const infoData = extractInfobarData(document);
-		if (infoData && infoData.saveUrl) {
-			if (browser && browser.runtime && browser.runtime.sendMessage) {
-				try {
-					options = await browser.runtime.sendMessage({ method: "tabs.getOptions", url: infoData.saveUrl });
-				} catch (error) {
-					// ignored
-				}
-			}
-			if (options.displayInfobar) {
-				appendInfobar(document, options, true);
-				refreshInfobarInfo(document, infoData);
-			}
-		}
-	}
-
-})(typeof globalThis == "object" ? globalThis : window);