urlpurify 2.0.0 → 2.1.1

package/dist/utils.mjs

@@ -1,14 +1,10 @@
 import { isAnyOf } from "./node_modules/trousse/dist/matching.mjs";
-import { isHostOf, isHostOrSubdomainOf } from "./node_modules/trousse/dist/urls.mjs";
+import { decodePercent, 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);
+	return decodePercent(value);
 };
 const unencodedTargetRegex = /^https?:\/\//i;
 const getParamValues = (url, name) => {
@@ -16,12 +12,13 @@ const getParamValues = (url, name) => {
 	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);
+		const separator = pair.indexOf("=");
+		const raw = separator === -1 ? "" : pair.slice(separator + 1);
 		if (!unencodedTargetRegex.test(raw)) {
-			values.push(entry[1]);
+			values.push(decodePercent(raw.replaceAll("+", " ")));
 			continue;
 		}
-		values.push(percentDecode(raw));
+		values.push(decodePercent(raw));
 	}
 	return values;
 };
@@ -50,13 +47,19 @@ const decodeBase64Binary = (value) => {
 		return atob(value);
 	} catch {}
 };
-const utf8Decoder = new TextDecoder();
 const decodeBase64 = (value) => {
 	const binary = decodeBase64Binary(value);
 	if (binary === void 0) return;
-	const bytes = new Uint8Array(binary.length);
-	for (let index = 0; index < binary.length; index++) bytes[index] = binary.charCodeAt(index);
-	return utf8Decoder.decode(bytes);
+	let encoded = "";
+	for (let index = 0; index < binary.length; index++) {
+		const byte = binary.charCodeAt(index);
+		if (byte < 128 && binary[index] !== "%") {
+			encoded += binary[index];
+			continue;
+		}
+		encoded += `%${byte.toString(16).toUpperCase().padStart(2, "0")}`;
+	}
+	return decodePercent(encoded);
 };
 const toBase64 = (base64Url) => {
 	return base64Url.replace(/-/g, "+").replace(/_/g, "/");
@@ -72,4 +75,4 @@ const getUtf8ByteLength = (value) => {
 	return utf8Encoder.encode(value).length;
 };
 //#endregion
-export { createParamExtractor, decodeBase64, decodeBase64Binary, decodeBase64Url, decodeBase64UrlBinary, getParamTarget, getParamValues, getUtf8ByteLength, percentDecode };
+export { createParamExtractor, decodeBase64, decodeBase64Binary, decodeBase64Url, decodeBase64UrlBinary, decodeEncodedScheme, getParamTarget, getParamValues, getUtf8ByteLength };

package/package.json

@@ -42,8 +42,8 @@
   "devDependencies": {
     "@types/bun": "^1.4.2",
     "kvalita": "^1.24.3",
-    "trousse": "^2.10.1",
+    "trousse": "^2.15.0",
     "tsdown": "^0.23.0"
   },
-  "version": "2.0.0"
+  "version": "2.1.1"
 }