unprint 0.18.14 → 0.18.16

package/package.json

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

package/src/app.js

@@ -374,37 +374,43 @@ 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 = originUrl?.replace(/^.*?:/, `${options.protocol}:`);
 
-	const { origin, protocol } = new URL(originUrl);
+	return new URL(urlPath, origin).href;
+}
 
-	if (protocol && /^\/\//.test(urlPath)) {
-		return `${protocol}${urlPath}`;
+// legacy argument
+function getQueryUrlArgs(selectorOrOptions, customOptions) {
+	if (customOptions) {
+		return {
+			selector: selectorOrOptions,
+			customOptions,
+		};
 	}
 
-	if (/^\//.test(urlPath)) {
-		return `${origin}${urlPath}`;
+	if (typeof selectorOrOptions === 'string') {
+		return {
+			selector: selectorOrOptions,
+			customOptions: null,
+		};
 	}
 
-	if (/^\.\//.test(urlPath)) {
-		return `${originUrl.replace(/\/+$/, '')}${urlPath.slice(1)}`;
+	if (!selectorOrOptions) {
+		return {
+			selector: 'a',
+			customOptions: null,
+		};
 	}
 
-	return `${origin}/${urlPath}`;
+	return {
+		selector: 'a',
+		customOptions: selectorOrOptions,
+	};
 }
 
-function queryUrl(context, selector = 'a', customOptions) {
+function queryUrl(context, ...args) {
+	const { selector, customOptions } = getQueryUrlArgs(...args);
+
 	const options = {
 		...context.options,
 		attribute: 'href',