unprint 0.11.1 → 0.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unprint",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Simplify common web scraping tasks while staying in control of the data.",
   "main": "src/app.js",
   "scripts": {

package/src/app.js

@@ -483,12 +483,10 @@ function querySourceSets(context, selector, attr = 'srcset', customOptions = {})
 	return sourceSets.map((sourceSet) => extractSourceSet(sourceSet, customOptions));
 }
 
-/*
 function removeStyleFunctionSpaces(el) {
 	// jsdom appears to have a bug where it ignores inline CSS attributes set to a function() containing spaces, e.g. url( image.png )
 	el.setAttribute('style', el.getAttribute('style').replace(/\(\s+(.*)\s+\)/g, (match, cssArgs) => `(${cssArgs})`));
 }
-*/
 
 function queryStyle(context, selector, customOptions) {
 	const options = {
@@ -496,12 +494,16 @@ function queryStyle(context, selector, customOptions) {
 		attribute: 'style',
 	};
 
-	const style = queryContent(context, selector, options);
+	const element = queryElement(context, selector, options);
 
-	if (style) {
-		return options.styleAttribute
-			? style.getPropertyValue(options.styleAttribute)
-			: style._values;
+	if (element) {
+		removeStyleFunctionSpaces(element);
+
+		if (element.style) {
+			return options.styleAttribute
+				? element.style.getPropertyValue(options.styleAttribute)
+				: element.style._values;
+		}
 	}
 
 	return null;
@@ -513,11 +515,19 @@ function queryStyles(context, selector, customOptions) {
 		attribute: 'style',
 	};
 
-	const elStyles = queryContents(context, selector, options).map((style) => (options.styleAttribute
-		? style.getPropertyValue(options.styleAttribute)
-		: style._values));
+	const elStyles = queryElements(context, selector, options).map((element) => {
+		removeStyleFunctionSpaces(element);
+
+		if (element.style) {
+			return options.styleAttribute
+				? element.style.getPropertyValue(options.styleAttribute)
+				: element.style._values;
+		}
+
+		return null;
+	});
 
-	return elStyles;
+	return elStyles.filter(Boolean);
 }
 
 function queryVideo(context, selector = 'source', customOptions) {

package/tests/index.html

@@ -42,7 +42,8 @@
 		<img class="srcset" srcset="https://i.redd.it/e91oo4ueyeb71.jpg 240w, https://i.redd.it/vn9h981hlx281.png 480w, https://i.redd.it/e91oo4ueyeb71.jpg 640w">
 		<img class="srcset" srcset="https://i.redd.it/e91oo4ueyeb71.jpg 240w, https://i.redd.it/vn9h981hlx281.png 480w, https://i.redd.it/e91oo4ueyeb71.jpg 640w">
 
-		<div class="style" style="background-image: url('https://i.imgur.com/eDQmLys.jpg'); color: red;"></div>
+		<!-- deliberate space in url( ) to test JSDOM's quirky handling of this -->
+		<div class="style" style="background-image: url( https://i.imgur.com/eDQmLys.jpg ); color: red;"></div>
 		<div class="style" style="margin: 1rem; color: blue;"></div>
 
 		<video id="video" poster="https://i.imgur.com/eDQmLys.jpg"><source src="https://i.imgur.com/eDQmLys.mp4"></video>