unprint 0.15.7 → 0.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unprint",
-  "version": "0.15.7",
+  "version": "0.16.1",
   "description": "Simplify common web scraping tasks while staying in control of the data.",
   "main": "src/app.js",
   "scripts": {
@@ -30,6 +30,7 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "jsdom": "^17.0.0",
     "moment-timezone": "^0.5.34",
+    "srcset": "^4.0.0",
     "tunnel": "^0.0.6"
   },
   "devDependencies": {

package/src/app.js

@@ -9,6 +9,7 @@ const axios = require('axios').default;
 const Bottleneck = require('bottleneck');
 const moment = require('moment-timezone');
 const merge = require('deepmerge');
+const srcset = require('srcset');
 
 const settings = {
 	throwErrors: false,
@@ -175,7 +176,12 @@ function queryContent(context, selector, customOptions) {
 }
 
 function queryContents(context, selector, customOptions) {
-	const options = { ...context.options, ...customOptions };
+	const options = {
+		...context.options,
+		trim: true,
+		...customOptions,
+	};
+
 	const targets = queryElements(context, selector, options);
 
 	return targets.map((target) => extractContent(target, options)).filter(Boolean);
@@ -448,20 +454,34 @@ function queryImages(context, selector = 'img', customOptions) {
 	return imageUrls.map((imageUrl) => prefixUrl(imageUrl, options.origin, options));
 }
 
+function getSourceSetDescriptor(source) {
+	if (source.width) {
+		return `${source.width}w`;
+	}
+
+	if (source.height) {
+		return `${source.height}w`;
+	}
+
+	if (source.density) {
+		return `${source.density}x`;
+	}
+
+	return 'fallback';
+}
+
 function extractSourceSet(sourceSet, customOptions) {
 	if (!sourceSet) {
 		return null;
 	}
 
-	const sources = sourceSet
-		.split(/\s*,\s+/)
+	const sources = srcset.parse(sourceSet)
 		.map((source) => {
-			const [link, descriptor] = source.trim().split(' ');
-
-			if (link) {
+			if (source.url) {
 				return {
-					descriptor: descriptor || 'fallback',
-					url: prefixUrl(link, customOptions.origin, customOptions.protocol),
+					...source,
+					descriptor: getSourceSetDescriptor(source),
+					url: prefixUrl(source.url, customOptions.origin, customOptions.protocol),
 				};
 			}
 
@@ -469,11 +489,27 @@ function extractSourceSet(sourceSet, customOptions) {
 		})
 		.filter(Boolean)
 		.sort((sourceA, sourceB) => {
-			if (sourceB.descriptor === 'fallback' || parseInt(sourceA.descriptor, 10) > parseInt(sourceB.descriptor, 10)) {
+			if (customOptions.sort === false) {
+				return 0;
+			}
+
+			if (sourceB.description === 'fallback') {
+				return -1;
+			}
+
+			if (sourceA.width && sourceB.width && sourceA.width > sourceB.width) {
 				return -1;
 			}
 
-			if (parseInt(sourceA.descriptor, 10) < parseInt(sourceB.descriptor, 10)) {
+			if (sourceA.height && sourceB.height && sourceA.height > sourceB.height) {
+				return -1;
+			}
+
+			if (sourceA.width && sourceB.width && sourceA.width < sourceB.width) {
+				return 1;
+			}
+
+			if (sourceA.height && sourceB.height && sourceA.height < sourceB.height) {
 				return 1;
 			}
 
@@ -482,7 +518,7 @@ function extractSourceSet(sourceSet, customOptions) {
 
 	if (customOptions.includeDescriptor) {
 		return sources.map((source) => ({
-			descriptor: source.descriptor,
+			...source,
 			url: prefixUrl(source.url),
 		}));
 	}

package/tests/index.html

@@ -40,7 +40,8 @@
 		<img class="image" src="https://i.redd.it/e91oo4ueyeb71.jpg">
 
 		<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">
+		<img class="srcset" srcset="https://i.redd.it/e91oo4ueyeb71.jpg 240w,https://i.redd.it/e91oo4ueyeb71.jpg 640w,https://i.redd.it/vn9h981hlx281.png 480w">
+		<img class="srcset" srcset="https://i.redd.it/e91oo4ueyeb71,comma,test.jpg 240w,https://i.redd.it/,sub/vn9h981hlx281.png 480w,https://i.redd.it/e91oo4ueyeb71.jpg 2x">
 
 		<!-- 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>