unprint 0.11.5 → 0.11.7

package/package.json

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

package/src/app.js

@@ -31,10 +31,6 @@ function handleError(error, code) {
 virtualConsole.on('error', (message) => handleError(message, 'JSDOM'));
 virtualConsole.on('jsdomError', (message) => handleError(message, 'JSDOM'));
 
-const defaultOptions = {
-	trim: true,
-};
-
 let globalOptions = {};
 
 function configure(newOptions) {
@@ -154,7 +150,12 @@ function extractContent(element, options) {
 }
 
 function queryContent(context, selector, customOptions) {
-	const options = { ...context.options, ...customOptions };
+	const options = {
+		...context.options,
+		trim: true,
+		...customOptions,
+	};
+
 	const target = queryElement(context, selector, options);
 
 	return extractContent(target, options);
@@ -199,7 +200,7 @@ function queryDatasets(context, selector, dataAttribute, customOptions) {
 
 const defaultNumberRegexp = /\d+([.,]\d+)?/;
 
-function matchNumberString(rawNumberString, options) {
+function extractNumber(rawNumberString, options) {
 	if (!rawNumberString) {
 		return null;
 	}
@@ -229,7 +230,7 @@ function queryNumber(context, selector, customOptions) {
 		...customOptions,
 	};
 
-	return matchNumberString(numberString, options);
+	return extractNumber(numberString, options);
 }
 
 function queryNumbers(context, selector, customOptions) {
@@ -247,7 +248,7 @@ function queryNumbers(context, selector, customOptions) {
 	}
 
 	return numberStrings
-		.map((numberString) => matchNumberString(numberString, options))
+		.map((numberString) => extractNumber(numberString, options))
 		.filter(Boolean);
 }
 
@@ -894,7 +895,6 @@ async function request(url, body, customOptions = {}, method = 'GET') {
 	}
 
 	const contextOptions = {
-		...defaultOptions,
 		...customOptions,
 		origin: url,
 	};
@@ -928,6 +928,7 @@ module.exports = {
 	initAll,
 	extractDate,
 	extractDuration,
+	extractNumber,
 	extractTimestamp,
 	formatDate,
 	dateConstants: {