unprint 0.9.1 → 0.9.3

package/package.json

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

package/src/app.js

@@ -362,14 +362,12 @@ function queryImages(context, selector = 'img', customOptions) {
 	return imageUrls.map((imageUrl) => prefixUrl(imageUrl, options.origin, options));
 }
 
-function querySourceSet(context, selector, attr = 'srcset', customOptions = {}) {
-	const srcset = queryAttribute(context, selector, attr, customOptions);
-
-	if (!srcset) {
+function extractSourceSet(sourceSet, customOptions) {
+	if (!sourceSet) {
 		return null;
 	}
 
-	const sources = srcset
+	const sources = sourceSet
 		.split(/\s*,\s*/)
 		.map((source) => {
 			const [link, descriptor] = source.split(' ');
@@ -406,6 +404,18 @@ function querySourceSet(context, selector, attr = 'srcset', customOptions = {})
 	return sources.map((source) => prefixUrl(source.url));
 }
 
+function querySourceSet(context, selector, attr = 'srcset', customOptions = {}) {
+	const sourceSet = queryAttribute(context, selector, attr, customOptions);
+
+	return extractSourceSet(sourceSet, customOptions);
+}
+
+function querySourceSets(context, selector, attr = 'srcset', customOptions = {}) {
+	const sourceSets = queryAttributes(context, selector, attr, customOptions);
+
+	return sourceSets.map((sourceSet) => extractSourceSet(sourceSet, customOptions));
+}
+
 function queryVideo(context, selector = 'source', customOptions) {
 	const options = {
 		...context.options,
@@ -452,28 +462,28 @@ function queryPosters(context, selector = 'video', customOptions) {
 	return posterUrls.map((posterUrl) => prefixUrl(posterUrl, options.origin, options));
 }
 
-function extractJson(element) {
-	if (!element) {
+function extractJson(dataString) {
+	if (!dataString) {
 		return null;
 	}
 
 	try {
-		return JSON.parse(element.innerHTML);
+		return JSON.parse(dataString);
 	} catch (error) {
 		return null;
 	}
 }
 
 function queryJson(context, selector, customOptions) {
-	const target = queryElement(context, selector, customOptions);
+	const dataString = queryContent(context, selector, customOptions);
 
-	return extractJson(target);
+	return extractJson(dataString);
 }
 
 function queryJsons(context, selector, customOptions) {
-	const targets = queryElements(context, selector, customOptions);
+	const dataStrings = queryContents(context, selector, customOptions);
 
-	return targets.map((target) => extractJson(target)).filter(Boolean);
+	return dataStrings.map((dataString) => extractJson(dataString)).filter(Boolean);
 }
 
 function extractDate(dateString, format, customOptions) {
@@ -605,7 +615,9 @@ const queryFns = {
 	duration: queryDuration,
 	dur: queryDuration,
 	sourceSet: querySourceSet,
+	sourceSets: querySourceSets,
 	srcSet: querySourceSet,
+	srcSets: querySourceSets,
 	url: queryUrl,
 	urls: queryUrls,
 	video: queryVideo,

package/tests/index.html

@@ -37,6 +37,7 @@
 		<img class="image" src="https://i.redd.it/1s22dsrqy0181.jpg">
 		<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">
 
 		<video id="video" poster="https://i.imgur.com/eDQmLys.jpg"><source src="https://i.imgur.com/eDQmLys.mp4"></video>

package/tests/init.js

@@ -23,6 +23,7 @@ async function initTest() {
 	console.log('timestamp', res.context.query.duration('#timestamp'));
 	console.log('number', res.context.query.number('.number'));
 	console.log('numbers', res.context.query.numbers('.number'));
+	console.log('number indexed', res.context.query.number('.number', { match: /(\d+)/, matchIndex: 1 }));
 	console.log('data', res.context.query.json('#json'));
 	console.log('items', res.context.query.contents('.item'));
 	console.log('link', res.context.query.url('#link'));
@@ -30,6 +31,7 @@ async function initTest() {
 	console.log('image', res.context.query.img('.image'));
 	console.log('images', res.context.query.imgs('.image'));
 	console.log('srcset', res.context.query.sourceSet('.srcset'));
+	console.log('srcsets', res.context.query.sourceSets('.srcset'));
 	console.log('path', res.context.query.url('#path'));
 	console.log('relative path', res.context.query.url('#relativePath'));
 	console.log('exists', res.context.query.exists('#title'));