urlpurify 2.1.1 → 2.2.0

package/dist/unwraps/yahooJapanAmpViewer.mjs

@@ -1,5 +1,5 @@
 import { decodePercent, isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-//#region src/unwraps/yahooJapanAmpViewer.ts
+// src/unwraps/yahooJapanAmpViewer.ts
 const httpsPathRegex = /^\/amp\/s\/(.+)$/;
 const httpPathRegex = /^\/amp\/(?!s\/)(.+)$/;
 const unwrapYahooJapanAmpViewer = (url) => {
@@ -11,5 +11,4 @@ const unwrapYahooJapanAmpViewer = (url) => {
 	const target = `${httpsMatch ? "https" : "http"}://${path}${url.search}`;
 	if (isHttpUrl(target)) return target;
 };
-//#endregion
 export { unwrapYahooJapanAmpViewer };

package/dist/unwraps/yahooMailImage.d.mts

@@ -0,0 +1,2 @@
+import { UrlUnwrapper } from "../types.mjs";
+export declare const unwrapYahooMailImage: UrlUnwrapper;

package/dist/unwraps/yahooMailImage.mjs

@@ -0,0 +1,9 @@
+import { decodePercent, getQueryParamValues, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+// src/unwraps/yahooMailImage.ts
+const unwrapYahooMailImage = (url) => {
+	if (!isHostOf(url, "ecp.yusercontent.com") || url.pathname !== "/mail") return;
+	const value = getQueryParamValues(url, "url", { decodeValues: false }).at(-1);
+	if (!value) return;
+	return decodePercent(value);
+};
+export { unwrapYahooMailImage };

package/dist/unwraps/yahooSearch.d.mts

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

package/dist/unwraps/yahooSearch.mjs

@@ -1,6 +1,6 @@
 import { decodePercent, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 import { decodeEncodedScheme } from "../utils.mjs";
-//#region src/unwraps/yahooSearch.ts
+// src/unwraps/yahooSearch.ts
 const hosts = [
 	"r.search.yahoo.com",
 	"ri.search.yahoo.com",
@@ -15,5 +15,4 @@ const unwrapYahooSearch = (url) => {
 	const unencodedMatch = url.pathname.match(unencodedTargetRegex);
 	if (unencodedMatch) return unencodedMatch[1];
 };
-//#endregion
 export { unwrapYahooSearch };

package/dist/unwraps/yamm.d.mts

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

package/dist/unwraps/yamm.mjs

@@ -1,9 +1,8 @@
 import { getParamTarget } from "../utils.mjs";
-//#region src/unwraps/yamm.ts
+// src/unwraps/yamm.ts
 const hostRegex = /^(?:[a-z0-9-]+-dot-)?yamm-track\.appspot\.com$/;
 const unwrapYamm = (url) => {
 	if (!hostRegex.test(url.hostname) || url.pathname !== "/Redirect") return;
 	return getParamTarget(url, "link", -1);
 };
-//#endregion
 export { unwrapYamm };

package/dist/unwraps/yandexMail.d.mts

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

package/dist/unwraps/yandexMail.mjs

@@ -1,6 +1,6 @@
 import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 import { decodeBase64Url, getParamValues } from "../utils.mjs";
-//#region src/unwraps/yandexMail.ts
+// src/unwraps/yandexMail.ts
 const hostRegex = /^mail\.yandex\.(?:com\.tr|[a-z]{2,3})$/;
 const unwrapYandexMail = (url) => {
 	if (!hostRegex.test(url.hostname) || url.pathname !== "/re.jsx") return;
@@ -10,5 +10,4 @@ const unwrapYandexMail = (url) => {
 	if (!decoded || !isHttpUrl(decoded)) return;
 	return decoded;
 };
-//#endregion
 export { unwrapYandexMail };

package/dist/unwraps/yandexMailImage.d.mts

@@ -0,0 +1,2 @@
+import { UrlUnwrapper } from "../types.mjs";
+export declare const unwrapYandexMailImage: UrlUnwrapper;

package/dist/unwraps/yandexMailImage.mjs

@@ -0,0 +1,10 @@
+import { decodePercent, getQueryParamValues, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+// src/unwraps/yandexMailImage.ts
+const resizePaths = ["/mailservice", "/orig"];
+const unwrapYandexMailImage = (url) => {
+	if (!isHostOf(url, "resize.yandex.net") || !resizePaths.includes(url.pathname)) return;
+	const value = getQueryParamValues(url, "url", { decodeValues: false }).at(-1);
+	if (!value) return;
+	return decodePercent(value);
+};
+export { unwrapYandexMailImage };

package/dist/unwraps/yandexTranslate.d.mts

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

package/dist/unwraps/yandexTranslate.mjs

@@ -1,11 +1,10 @@
 import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
-//#region src/unwraps/yandexTranslate.ts
-const proxyPathRegex = /^\/proxy_u\/[^/]+\/(?:(https?)\/)?(.+)$/;
+// src/unwraps/yandexTranslate.ts
+const proxyPathRegex = /^\/proxy_u\/[^/]+\/(?:(?<scheme>https?)\/)?(?<target>.+)$/;
 const unwrapYandexTranslate = (url) => {
 	if (!isHostOf(url, "translated.turbopages.org")) return;
 	const match = url.pathname.match(proxyPathRegex);
-	if (!match) return;
-	return `${match[1] ?? "http"}://${match[2]}${url.search}${url.hash}`;
+	if (!match?.groups) return;
+	return `${match.groups.scheme ?? "http"}://${match.groups.target}${url.search}${url.hash}`;
 };
-//#endregion
 export { unwrapYandexTranslate };

package/dist/unwraps/yandexTurbo.d.mts

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

package/dist/unwraps/yandexTurbo.mjs

@@ -1,5 +1,5 @@
 import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/yandexTurbo.ts
+// src/unwraps/yandexTurbo.ts
 const turbopagesHostRegex = /\.turbopages\.org$/;
 const turbopagesPathRegex = /^\/[^/]+\/s\/(.+)$/;
 const hostInPathRegex = /^\/turbo\/([^/]+)\/s\/(.+)$/;
@@ -27,5 +27,4 @@ const unwrapYandexTurbo = (url) => {
 	if (!match) return;
 	return `https://${url.hostname.replace(turbopagesHostRegex, "").replace(dashRegex, ".")}/${match[1]}`;
 };
-//#endregion
 export { unwrapYandexTurbo };

package/dist/unwraps/yelp.d.mts

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

package/dist/unwraps/yelp.mjs

@@ -1,5 +1,5 @@
 import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/yelp.ts
+// src/unwraps/yelp.ts
 const redirectPaths = ["/biz_redir", "/redir"];
 const extractTarget = createParamExtractor({
 	hosts: "www.yelp.com",
@@ -9,5 +9,4 @@ const unwrapYelp = (url) => {
 	if (!redirectPaths.includes(url.pathname)) return;
 	return extractTarget(url);
 };
-//#endregion
 export { unwrapYelp };

package/dist/unwraps/yesware.d.mts

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

package/dist/unwraps/yesware.mjs

@@ -1,6 +1,6 @@
 import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/yesware.ts
+// src/unwraps/yesware.ts
 const trackPathRegex = /^\/tt\/[\da-f]{40}\/[\da-f]{32}\/[\da-f]{32}\/(.+)$/;
 const linkPathRegex = /^\/tl\/[\da-f]{40}\/[\da-f]{32}\/[\da-f]{32}$/;
 const extractLinkTarget = createParamExtractor({
@@ -15,5 +15,4 @@ const unwrapYesware = (url) => {
 	const target = `https://${match[1]}${url.search}${url.hash}`;
 	if (isHttpUrl(target)) return target;
 };
-//#endregion
 export { unwrapYesware };

package/dist/unwraps/yourMembership.d.mts

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

package/dist/unwraps/yourMembership.mjs

@@ -1,6 +1,6 @@
 import { decodePercent, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 import { getParamValues } from "../utils.mjs";
-//#region src/unwraps/yourMembership.ts
+// src/unwraps/yourMembership.ts
 const ymlinkRegex = /^\d+$/;
 const encodedSchemeRegex = /^https?%3A/i;
 const unwrapYourMembership = (url) => {
@@ -9,5 +9,4 @@ const unwrapYourMembership = (url) => {
 	if (target && encodedSchemeRegex.test(target)) target = decodePercent(target);
 	if (target && isHttpUrl(target)) return target;
 };
-//#endregion
 export { unwrapYourMembership };

package/dist/unwraps/youtube.d.mts

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

package/dist/unwraps/youtube.mjs

@@ -1,9 +1,8 @@
 import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/youtube.ts
+// src/unwraps/youtube.ts
 const unwrapYouTube = createParamExtractor({
 	hosts: ["www.youtube.com", "youtube.com"],
 	path: "/redirect",
 	params: ["q"]
 });
-//#endregion
 export { unwrapYouTube };

package/dist/unwraps/zanox.d.mts

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

package/dist/unwraps/zanox.mjs

@@ -1,5 +1,5 @@
 import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/zanox.ts
+// src/unwraps/zanox.ts
 const bracketRegex = /[?&]ulp=(?:\[\[|%5B%5B)(.+?)(?:\]\]|%5D%5D)/i;
 const extractUlp = createParamExtractor({
 	hosts: "ad.zanox.com",
@@ -13,5 +13,4 @@ const unwrapZanox = (url) => {
 	if (bracketed) return bracketed[1];
 	return target;
 };
-//#endregion
 export { unwrapZanox };

package/dist/unwraps/zayads.d.mts

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

package/dist/unwraps/zayads.mjs

@@ -1,10 +1,9 @@
 import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 import { getPathTarget } from "../pathTarget.mjs";
-//#region src/unwraps/zayads.ts
+// src/unwraps/zayads.ts
 const campaignPrefixRegex = /^\/[\w-]{22}\//;
 const unwrapZayads = (url) => {
 	if (!isHostOf(url, "track.zayads.ru")) return;
 	return getPathTarget(url, campaignPrefixRegex);
 };
-//#endregion
 export { unwrapZayads };

package/dist/unwraps/zemanta.d.mts

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

package/dist/unwraps/zemanta.mjs

@@ -1,9 +1,8 @@
 import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/zemanta.ts
+// src/unwraps/zemanta.ts
 const unwrapZemanta = createParamExtractor({
 	hosts: "r.zemanta.com",
 	path: "/",
 	params: ["u"]
 });
-//#endregion
 export { unwrapZemanta };

package/dist/unwraps/zencastr.d.mts

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

package/dist/unwraps/zencastr.mjs

@@ -1,10 +1,9 @@
 import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 import { getPathTarget } from "../pathTarget.mjs";
-//#region src/unwraps/zencastr.ts
+// src/unwraps/zencastr.ts
 const redirectPrefixRegex = /^\/r\//;
 const unwrapZencastr = (url) => {
 	if (!isHostOf(url, ["r.zencastr.com", "r.zen.ai"])) return;
 	return getPathTarget(url, redirectPrefixRegex);
 };
-//#endregion
 export { unwrapZencastr };

package/dist/unwraps/zhihu.d.mts

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

package/dist/unwraps/zhihu.mjs

@@ -1,9 +1,8 @@
 import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/zhihu.ts
+// src/unwraps/zhihu.ts
 const unwrapZhihu = createParamExtractor({
 	hosts: "link.zhihu.com",
 	path: "/",
 	params: ["target"]
 });
-//#endregion
 export { unwrapZhihu };

package/dist/unwraps/zix.d.mts

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

package/dist/unwraps/zix.mjs

@@ -1,5 +1,5 @@
 import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/zix.ts
+// src/unwraps/zix.ts
 const linkPathRegex = /^\/u\/[0-9a-f]{8}\/[A-Za-z0-9_-]+$/;
 const extractTarget = createParamExtractor({
 	hosts: "link.zixcentral.com",
@@ -9,5 +9,4 @@ const unwrapZix = (url) => {
 	if (!linkPathRegex.test(url.pathname)) return;
 	return extractTarget(url);
 };
-//#endregion
 export { unwrapZix };

package/dist/unwraps/zscalerIsolation.d.mts

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

package/dist/unwraps/zscalerIsolation.mjs

@@ -1,5 +1,5 @@
 import { createParamExtractor } from "../utils.mjs";
-//#region src/unwraps/zscalerIsolation.ts
+// src/unwraps/zscalerIsolation.ts
 const sessionPathRegex = /^\/profile\/[0-9a-f-]{36}\/zia-session\/$/;
 const extractTarget = createParamExtractor({
 	hosts: /^[0-9a-f]{8}\.isolation\.zscaler\.com$/,
@@ -9,5 +9,4 @@ const unwrapZscalerIsolation = (url) => {
 	if (!sessionPathRegex.test(url.pathname)) return;
 	return extractTarget(url);
 };
-//#endregion
 export { unwrapZscalerIsolation };

package/dist/utils.d.mts

@@ -1,5 +1,4 @@
 import { UrlUnwrapper } from "./types.mjs";
-//#region src/utils.d.ts
 export type ParamExtractorConfig = ({
   domains: string | Array<string>;
   hosts?: never;
@@ -10,5 +9,4 @@ export type ParamExtractorConfig = ({
   path?: string;
   params: Array<string>;
 };
-export declare const createParamExtractor: (config: ParamExtractorConfig) => UrlUnwrapper;
-//#endregion
+export declare const createParamExtractor: (config: ParamExtractorConfig) => UrlUnwrapper;

package/dist/utils.mjs

@@ -1,6 +1,6 @@
 import { isAnyOf } from "./node_modules/trousse/dist/matching.mjs";
-import { decodePercent, isHostOf, isHostOrSubdomainOf } from "./node_modules/trousse/dist/urls.mjs";
-//#region src/utils.ts
+import { decodePercent, getQueryParamValues, isHostOf, isHostOrSubdomainOf } from "./node_modules/trousse/dist/urls.mjs";
+// src/utils.ts
 const encodedSchemeRegex = /^https?%3A/i;
 const decodeEncodedScheme = (value) => {
 	if (!encodedSchemeRegex.test(value)) return value;
@@ -9,11 +9,11 @@ const decodeEncodedScheme = (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 separator = pair.indexOf("=");
-		const raw = separator === -1 ? "" : pair.slice(separator + 1);
+	const raws = getQueryParamValues(url, name, {
+		decodeValues: false,
+		preserveEmptyValues: true
+	});
+	for (const raw of raws) {
 		if (!unencodedTargetRegex.test(raw)) {
 			values.push(decodePercent(raw.replaceAll("+", " ")));
 			continue;
@@ -74,5 +74,4 @@ const utf8Encoder = new TextEncoder();
 const getUtf8ByteLength = (value) => {
 	return utf8Encoder.encode(value).length;
 };
-//#endregion
 export { createParamExtractor, decodeBase64, decodeBase64Binary, decodeBase64Url, decodeBase64UrlBinary, decodeEncodedScheme, getParamTarget, getParamValues, getUtf8ByteLength };

package/package.json

@@ -40,10 +40,10 @@
     "test": "bun test"
   },
   "devDependencies": {
-    "@types/bun": "^1.4.2",
-    "kvalita": "^1.24.3",
-    "trousse": "^2.15.0",
-    "tsdown": "^0.23.0"
+    "@types/bun": "^1.4.4",
+    "kvalita": "^1.30.0",
+    "trousse": "^3.2.0",
+    "tsdown": "0.23.4"
   },
-  "version": "2.1.1"
+  "version": "2.2.0"
 }