single-file-core 1.0.62 → 1.0.63

package/package.json

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

package/processors/hooks/content/content-hooks-frames-web.js

@@ -43,6 +43,8 @@
 	const FETCH_REQUEST_EVENT = "single-file-request-fetch";
 	const FETCH_ACK_EVENT = "single-file-ack-fetch";
 	const FETCH_RESPONSE_EVENT = "single-file-response-fetch";
+	const GET_ADOPTED_STYLESHEETS_REQUEST_EVENT = "single-file-request-get-adopted-stylesheets";
+	const GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT = "single-file-response-get-adopted-stylesheets";
 	const NEW_FONT_FACE_EVENT = "single-file-new-font-face";
 	const DELETE_FONT_EVENT = "single-file-delete-font";
 	const CLEAR_FONTS_EVENT = "single-file-clear-fonts";
@@ -310,6 +312,14 @@
 		dispatchEvent(new CustomEvent(FETCH_RESPONSE_EVENT, { detail }));
 	});
 
+	addEventListener(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, event => {
+		const shadowRoot = event.target.shadowRoot;
+		const adoptedStyleSheets = Array.from(shadowRoot.adoptedStyleSheets).map(stylesheet => Array.from(stylesheet.cssRules).map(cssRule => cssRule.cssText).join("\n"));
+		if (adoptedStyleSheets.length) {
+			event.target.dispatchEvent(new CustomEvent(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, { detail: { adoptedStyleSheets } }));
+		}
+	}, { capture: true });
+
 	if (globalThis.FontFace) {
 		const FontFace = globalThis.FontFace;
 		globalThis.FontFace = function () {

package/single-file-helper.js

@@ -28,6 +28,8 @@ import * as hooksFrames from "./processors/hooks/content/content-hooks-frames.js
 
 const ON_BEFORE_CAPTURE_EVENT_NAME = "single-file-on-before-capture";
 const ON_AFTER_CAPTURE_EVENT_NAME = "single-file-on-after-capture";
+const GET_ADOPTED_STYLESHEETS_REQUEST_EVENT = "single-file-request-get-adopted-stylesheets";
+const GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT = "single-file-response-get-adopted-stylesheets";
 const REMOVED_CONTENT_ATTRIBUTE_NAME = "data-single-file-removed-content";
 const HIDDEN_CONTENT_ATTRIBUTE_NAME = "data-single-file-hidden-content";
 const KEPT_CONTENT_ATTRIBUTE_NAME = "data-single-file-kept-content";
@@ -228,8 +230,15 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 				shadowRootInfo.content = shadowRoot.innerHTML;
 				shadowRootInfo.mode = shadowRoot.mode;
 				try {
-					if (shadowRoot.adoptedStyleSheets && shadowRoot.adoptedStyleSheets.length) {
-						shadowRootInfo.adoptedStyleSheets = Array.from(shadowRoot.adoptedStyleSheets).map(stylesheet => Array.from(stylesheet.cssRules).map(cssRule => cssRule.cssText).join("\n"));
+					if (shadowRoot.adoptedStyleSheets) {
+						if (shadowRoot.adoptedStyleSheets.length) {
+							shadowRootInfo.adoptedStyleSheets = Array.from(shadowRoot.adoptedStyleSheets).map(stylesheet => Array.from(stylesheet.cssRules).map(cssRule => cssRule.cssText).join("\n"));
+						} else if (shadowRoot.adoptedStyleSheets.length === undefined) {
+							const listener = event => shadowRootInfo.adoptedStyleSheets = event.detail.adoptedStyleSheets;
+							element.addEventListener(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, listener);
+							element.dispatchEvent(new CustomEvent(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, { options: { bubbles: true, composed: true }}));
+							element.removeEventListener(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, listener);
+						}
 					}
 				} catch (error) {
 					// ignored

package/vendor/css-font-property-parser.js

@@ -177,14 +177,16 @@ function parse(value) {
 				while (tokenNode && tokenNode.data.type == "Operator" && tokenNode.data.value == ",") {
 					tokenNode = tokenNode.next;
 				}
-				if (tokenNode.data.type == "Identifier") {
-					while (tokenNode && tokenNode.data.type == "Identifier") {
-						familyName += " " + removeQuotes(cssTree.generate(tokenNode.data));
+				if (tokenNode) {
+					if (tokenNode.data.type == "Identifier") {
+						while (tokenNode && tokenNode.data.type == "Identifier") {
+							familyName += " " + cssTree.generate(tokenNode.data);
+							tokenNode = tokenNode.next;
+						}
+					} else {
+						familyName = removeQuotes(cssTree.generate(tokenNode.data));
 						tokenNode = tokenNode.next;
 					}
-				} else {
-					familyName = removeQuotes(cssTree.generate(tokenNode.data));
-					tokenNode = tokenNode.next;
 				}
 				familyName = familyName.trim();
 				if (familyName) {