unprint 0.18.15 → 0.18.17

package/package.json

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

package/src/app.js

@@ -374,68 +374,12 @@ function prefixUrl(urlPath, originUrl, customOptions) {
 		...customOptions,
 	};
 
-	if (/^http/.test(urlPath)) {
-		// this is already a complete URL
-		return urlPath;
-	}
-
-	if (options.protocol && /^\/\//.test(urlPath)) {
-		return `${options.protocol.replace(/:$/, '')}:${urlPath}`; // allow protocol to be defined either as 'https' or 'https:'
-	}
-
-	if (!originUrl) {
-		return urlPath;
-	}
-
-	const { origin, protocol } = new URL(originUrl);
-
-	if (protocol && /^\/\//.test(urlPath)) {
-		return `${protocol}${urlPath}`;
-	}
-
-	if (/^\//.test(urlPath)) {
-		return `${origin}${urlPath}`;
-	}
-
-	if (/^\.\//.test(urlPath)) {
-		return `${originUrl.replace(/\/+$/, '')}${urlPath.slice(1)}`;
-	}
-
-	return `${origin}/${urlPath}`;
-}
-
-// legacy argument
-function getQueryUrlArgs(selectorOrOptions, customOptions) {
-	if (customOptions) {
-		return {
-			selector: selectorOrOptions,
-			customOptions,
-		};
-	}
-
-	if (typeof selectorOrOptions === 'string') {
-		return {
-			selector: selectorOrOptions,
-			customOptions: null,
-		};
-	}
+	const origin = originUrl?.replace(/^.*?:/, `${options.protocol}:`);
 
-	if (!selectorOrOptions) {
-		return {
-			selector: 'a',
-			customOptions: null,
-		};
-	}
-
-	return {
-		selector: 'a',
-		customOptions: selectorOrOptions,
-	};
+	return new URL(urlPath, origin).href;
 }
 
-function queryUrl(context, ...args) {
-	const { selector, customOptions } = getQueryUrlArgs(...args);
-
+function queryUrl(context, selector = 'a', customOptions) {
 	const options = {
 		...context.options,
 		attribute: 'href',