urlpurify 1.5.0 → 1.6.0

package/dist/utils.mjs

@@ -1,12 +1,47 @@
 import { isAnyOf } from "./node_modules/trousse/dist/matching.mjs";
+import { isHostOf, isHostOrSubdomainOf } from "./node_modules/trousse/dist/urls.mjs";
 //#region src/utils.ts
+const percentDecode = (value) => {
+	const escaped = value.replaceAll("+", "%2B").replaceAll("&", "%26");
+	return new URLSearchParams(`value=${escaped}`).get("value") ?? "";
+};
+const encodedSchemeRegex = /^https?%3A/i;
+const decodeEncodedScheme = (value) => {
+	if (!encodedSchemeRegex.test(value)) return value;
+	return percentDecode(value);
+};
+const unencodedTargetRegex = /^https?:\/\//i;
+const getParamValues = (url, name) => {
+	const values = [];
+	for (const pair of url.search.slice(1).split("&")) {
+		const entry = new URLSearchParams(`&${pair}`).entries().next().value;
+		if (!entry || entry[0] !== name) continue;
+		const raw = pair.slice(pair.indexOf("=") + 1);
+		if (!unencodedTargetRegex.test(raw)) {
+			values.push(entry[1]);
+			continue;
+		}
+		values.push(percentDecode(raw));
+	}
+	return values;
+};
+const getParamTarget = (url, name, index = 0) => {
+	const value = getParamValues(url, name).at(index);
+	if (!value) return;
+	return decodeEncodedScheme(value);
+};
 const createParamExtractor = (config) => {
+	const isHostMatch = (url) => {
+		if (config.domains !== void 0) return isHostOrSubdomainOf(url, config.domains);
+		if (config.hosts instanceof RegExp) return isAnyOf(url.hostname, config.hosts);
+		return isHostOf(url, config.hosts);
+	};
 	return (url) => {
-		if (!isAnyOf(url.hostname, config.hosts)) return;
+		if (!isHostMatch(url)) return;
 		if (config.path && url.pathname !== config.path) return;
 		for (const param of config.params) {
-			const value = url.searchParams.get(param);
-			if (value) return value;
+			const value = getParamValues(url, param).at(0);
+			if (value) return decodeEncodedScheme(value);
 		}
 	};
 };
@@ -37,4 +72,4 @@ const getUtf8ByteLength = (value) => {
 	return utf8Encoder.encode(value).length;
 };
 //#endregion
-export { createParamExtractor, decodeBase64, decodeBase64Binary, decodeBase64Url, decodeBase64UrlBinary, getUtf8ByteLength };
+export { createParamExtractor, decodeBase64, decodeBase64Binary, decodeBase64Url, decodeBase64UrlBinary, getParamTarget, getParamValues, getUtf8ByteLength, percentDecode };

package/package.json

@@ -45,5 +45,5 @@
     "trousse": "^2.6.1",
     "tsdown": "^0.23.0"
   },
-  "version": "1.5.0"
+  "version": "1.6.0"
 }

package/dist/unwraps/idealoPartner.d.mts

@@ -1,4 +0,0 @@
-import { UrlUnwrapper } from "../types.mjs";
-//#region src/unwraps/idealoPartner.d.ts
-export declare const unwrapIdealoPartner: UrlUnwrapper;
-//#endregion

package/dist/unwraps/idealoPartner.mjs

@@ -1,8 +0,0 @@
-import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/idealoPartner.ts
-const unwrapIdealoPartner = createParamExtractor({
-	hosts: /\.idealo-partner\.com$/,
-	params: ["trg"]
-});
-//#endregion
-export { unwrapIdealoPartner };

package/dist/unwraps/pxf.d.mts

@@ -1,4 +0,0 @@
-import { UrlUnwrapper } from "../types.mjs";
-//#region src/unwraps/pxf.d.ts
-export declare const unwrapPxf: UrlUnwrapper;
-//#endregion

package/dist/unwraps/pxf.mjs

@@ -1,8 +0,0 @@
-import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/pxf.ts
-const unwrapPxf = createParamExtractor({
-	hosts: /\.pxf\.io$/,
-	params: ["u"]
-});
-//#endregion
-export { unwrapPxf };

package/dist/unwraps/sjv.d.mts

@@ -1,4 +0,0 @@
-import { UrlUnwrapper } from "../types.mjs";
-//#region src/unwraps/sjv.d.ts
-export declare const unwrapSjv: UrlUnwrapper;
-//#endregion

package/dist/unwraps/sjv.mjs

@@ -1,8 +0,0 @@
-import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/sjv.ts
-const unwrapSjv = createParamExtractor({
-	hosts: /\.sjv\.io$/,
-	params: ["u"]
-});
-//#endregion
-export { unwrapSjv };