unprint 0.16.1 → 0.16.2

package/README.md

@@ -52,7 +52,9 @@ query.element('h1#title'); // HTMLHeadingElement
 **From here on, the query methods will be described in their initialized form.** The API for the *uninitialized* methods is identical, except for the element passed as the first argument
 
 #### Selector
-The selector can be a CSS selector, an XPath selector starting with `/`, or an array of either or both acting as fallbacks. If the selector is falsy, the input element will be used.
+The selector can be a CSS selector, an XPath selector starting with `/` or `(`, or an array of either or both acting as fallbacks. If the selector is falsy, the input element will be used.
+
+* XPath Caveat: `//` and `(//` at the *start* of the selector are converted to `.//` and `(.//` for more intuitive relative selection, but any consecutive `//` will be absolute.
 
 #### Querying multiple elements
 Most methods can be used in plural, returning an array of results, i.e. `query.elements()`, `query.dates()`.

package/package.json

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

package/src/app.js

@@ -74,9 +74,9 @@ function getElements(context, selector, firstOnly = false) {
 		return context.element;
 	}
 
-	if (/^\//.test(selector)) {
-		// XPath selector
-		const iterator = globalWindow.document.evaluate(`.${selector}`, context.element, null, globalWindow.XPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
+	if (selector.startsWith('/') || selector.startsWith('(')) {
+		// XPath selector, . prefix ensures selector is relative to current node, won't work for deeper selections
+		const iterator = globalWindow.document.evaluate(selector.replace(/^\//, './').replace(/^\(\//, '(./'), context.element, null, globalWindow.XPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
 
 		if (firstOnly) {
 			return iterator.iterateNext();

package/tests/init.js

@@ -37,6 +37,7 @@ async function initTest() {
 	console.log('title', res.context.query.content('//*[contains(text(), "Test")]'));
 	console.log('date', res.context.query.date('#date', 'DD-MM-YYYY HH:mm'));
 	console.log('date xpath', res.context.query.date('//div[contains(text(), "Today:")]', 'MMM DD, YYYY'));
+	console.log('date grouped xpath', res.context.query.date('(//div[contains(text(), "Today:")])', 'MMM DD, YYYY'));
 	console.log('duration', res.context.query.duration('#duration'));
 	console.log('timestamp', res.context.query.duration('#timestamp'));
 	console.log('timestring', res.context.query.duration('#timestring'));