unprint 0.10.6 → 0.10.8

package/README.md

@@ -77,6 +77,7 @@ Return the text contents of an element (`.textContent`).
 Options
 * `match`: The regular expression to use to extract a number from text, default `/\d+(\.\d+)?/` for decimal numbers.
 * `matchIndex`: The index of the match result, useful for expressions containing groups or a global flag, default `0`.
+* `separator`: Whether to use `.` (Europe) or `,` (US) as the decimal separator, default `.`
 
 Return the contents of the element or attribute as a Number primitive.
 

package/package.json

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

package/src/app.js

@@ -193,13 +193,21 @@ function queryDatasets(context, selector, dataAttribute, customOptions) {
 
 const defaultNumberRegexp = /\d+([.,]\d+)?/;
 
-function matchNumberString(numberString, options) {
+function matchNumberString(rawNumberString, options) {
+	if (!rawNumberString) {
+		return null;
+	}
+
+	const numberString = options.separator === ','
+		? rawNumberString.replace(',', '.')
+		: rawNumberString.replace(',', '');
+
 	if (numberString && options.match) {
-		return Number(numberString.match(options.match)?.[options.matchIndex]?.replace(',', '.')) || null;
+		return Number(numberString.match(options.match)?.[options.matchIndex]) || null;
 	}
 
 	if (numberString) {
-		return Number(numberString.replace(',', '.')) || null;
+		return Number(numberString) || null;
 	}
 
 	return null;
@@ -211,6 +219,7 @@ function queryNumber(context, selector, customOptions) {
 	const options = {
 		match: defaultNumberRegexp,
 		matchIndex: 0,
+		separator: '.',
 		...customOptions,
 	};
 
@@ -223,6 +232,7 @@ function queryNumbers(context, selector, customOptions) {
 	const options = {
 		match: defaultNumberRegexp,
 		matchIndex: 0,
+		separator: '.',
 		...customOptions,
 	};
 

package/tests/init.js

@@ -24,6 +24,7 @@ async function initTest() {
 	console.log('timestring', res.context.query.duration('#timestring'));
 	console.log('number', res.context.query.number('.number'));
 	console.log('numbers', res.context.query.numbers('.number'));
+	console.log('numbers comma', res.context.query.numbers('.number', { separator: ',' }));
 	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'));