urlpurify 1.4.1 → 1.4.2

package/dist/clean.mjs

@@ -1,4 +1,4 @@
-import { parseUrl } from "./node_modules/trousse/dist/urls.mjs";
+import { parseUrl, stripWww } from "./node_modules/trousse/dist/urls.mjs";
 import { defaultTrackingParams, defaultUnwrappers } from "./defaults.mjs";
 //#region src/clean.ts
 const trackingMatcherCache = /* @__PURE__ */ new WeakMap();
@@ -28,9 +28,8 @@ const deleteTrackingParams = (url, trackingParams) => {
 	for (const key of keysToDelete) url.searchParams.delete(key);
 	return keysToDelete.length > 0;
 };
-const wwwPrefixRegex = /^www\./;
 const stripHostPrefix = (host) => {
-	return host.replace(wwwPrefixRegex, "").toLowerCase();
+	return stripWww(host).toLowerCase();
 };
 const deleteSelfReferentialParams = (url) => {
 	const value = url.searchParams.get("ref");

package/dist/node_modules/trousse/dist/is.mjs

@@ -0,0 +1,6 @@
+//#region node_modules/trousse/dist/is.js
+const isNullish = (value) => {
+	return value == null;
+};
+//#endregion
+export { isNullish };

package/dist/node_modules/trousse/dist/matching.mjs

@@ -1,7 +1,9 @@
+import { isNullish } from "./is.mjs";
 //#region node_modules/trousse/dist/matching.js
 const isAnyOf = (value, patterns, parser) => {
-	const parsedValue = parser ? parser(value) : value?.toLowerCase()?.trim();
-	return patterns.some((pattern) => {
+	if (isNullish(value)) return false;
+	const parsedValue = parser ? parser(value) : value.toLowerCase().trim();
+	return (typeof patterns === "string" || patterns instanceof RegExp ? [patterns] : patterns).some((pattern) => {
 		if (pattern instanceof RegExp) return pattern.test(parsedValue);
 		return parsedValue === pattern.toLowerCase().trim();
 	});

package/dist/node_modules/trousse/dist/urls.mjs

@@ -9,12 +9,28 @@ const parseUrl = (value, base) => {
 const isHostOf = (url, hosts) => {
 	const hostname = parseUrl(url)?.hostname;
 	if (!hostname) return false;
-	return isAnyOf(hostname, typeof hosts === "string" ? [hosts] : hosts);
+	return isAnyOf(hostname, hosts);
 };
 const isSubdomainOf = (url, domains) => {
 	const hostname = parseUrl(url)?.hostname;
 	if (!hostname) return false;
 	return endsWithAnyOf(hostname, (typeof domains === "string" ? [domains] : domains).map((domain) => `.${domain}`));
 };
+const isHostOrSubdomainOf = (url, domains) => {
+	return isHostOf(url, domains) || isSubdomainOf(url, domains);
+};
+const decodeSegment = (segment) => {
+	if (segment === void 0) return;
+	try {
+		return decodeURIComponent(segment);
+	} catch {}
+};
+const wwwPrefixRegex = /^www\./;
+const schemeSeparator = String.raw`\.*[:\s=\\/][:\s=.\\/]*`;
+new RegExp(String.raw`^\/?[htps]{2,7}${schemeSeparator}([htps]{2,7})${schemeSeparator}[.,:/]*(www[./]+)?`, "i");
+new RegExp(String.raw`^\/?(?:h[htps():]{1,10}|t{1,2}ps?)${schemeSeparator}[.,:/]*(www[./]+)?`, "i");
+const stripWww = (hostname) => {
+	return hostname.replace(wwwPrefixRegex, "");
+};
 //#endregion
-export { isHostOf, isSubdomainOf, parseUrl };
+export { decodeSegment, isHostOf, isHostOrSubdomainOf, isSubdomainOf, parseUrl, stripWww };

package/dist/unwraps/adjust.mjs

@@ -1,6 +1,7 @@
+import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/adjust.ts
 const unwrapAdjust = (url) => {
-	if (url.hostname !== "app.adjust.com") return;
+	if (!isHostOf(url, "app.adjust.com")) return;
 	const target = url.searchParams.get("redirect");
 	if (target?.startsWith("https://") !== true && target?.startsWith("http://") !== true) return;
 	return target;

package/dist/unwraps/anonymTo.mjs

@@ -1,6 +1,7 @@
+import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/anonymTo.ts
 const unwrapAnonymTo = (url) => {
-	if (url.hostname !== "anonym.to" && url.hostname !== "www.anonym.to") return;
+	if (!isHostOf(url, ["anonym.to", "www.anonym.to"])) return;
 	return url.search.slice(1) || void 0;
 };
 //#endregion

package/dist/unwraps/deviantartOutgoing.mjs

@@ -1,6 +1,7 @@
+import { isHostOrSubdomainOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/deviantartOutgoing.ts
 const unwrapDeviantartOutgoing = (url) => {
-	if (!url.hostname.endsWith("deviantart.com") || !url.pathname.endsWith("/outgoing")) return;
+	if (!isHostOrSubdomainOf(url, "deviantart.com") || !url.pathname.endsWith("/outgoing")) return;
 	return url.search.slice(1) || void 0;
 };
 //#endregion

package/dist/unwraps/hrefLi.mjs

@@ -1,6 +1,7 @@
+import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/hrefLi.ts
 const unwrapHrefLi = (url) => {
-	if (url.hostname !== "href.li" && url.hostname !== "www.href.li") return;
+	if (!isHostOf(url, ["href.li", "www.href.li"])) return;
 	return url.search.slice(1) || void 0;
 };
 //#endregion

package/dist/unwraps/mozillaOutgoing.mjs

@@ -1,13 +1,12 @@
+import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/mozillaOutgoing.ts
 const pathRegex = /^\/v1\/[0-9a-f]{64}\/(.+)$/;
-const mozillaOutgoingHosts = /* @__PURE__ */ new Set(["outgoing.prod.mozaws.net", "prod.outgoing.prod.webservices.mozgcp.net"]);
+const mozillaOutgoingHosts = ["outgoing.prod.mozaws.net", "prod.outgoing.prod.webservices.mozgcp.net"];
 const unwrapMozillaOutgoing = (url) => {
-	if (!mozillaOutgoingHosts.has(url.hostname)) return;
+	if (!isHostOf(url, mozillaOutgoingHosts)) return;
 	const match = url.pathname.match(pathRegex);
 	if (!match) return;
-	try {
-		return decodeURIComponent(match[1]);
-	} catch {}
+	return decodeSegment(match[1]);
 };
 //#endregion
 export { unwrapMozillaOutgoing };

package/dist/unwraps/nicoMs.mjs

@@ -1,7 +1,8 @@
+import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/nicoMs.ts
 const nicoMsRegex = /^\/((?:sm|nm|so|im)\w+)$/;
 const unwrapNicoMs = (url) => {
-	if (url.hostname !== "nico.ms") return;
+	if (!isHostOf(url, "nico.ms")) return;
 	const match = url.pathname.match(nicoMsRegex);
 	if (!match) return;
 	const id = match[1];

package/dist/unwraps/postmark.mjs

@@ -1,12 +1,11 @@
+import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/postmark.ts
 const postmarkPathRegex = /^\/[23][st]\/([^/]+)\//;
 const unwrapPostmark = (url) => {
-	if (url.hostname !== "click.pstmrk.it") return;
+	if (!isHostOf(url, "click.pstmrk.it")) return;
 	const match = url.pathname.match(postmarkPathRegex);
 	if (!match) return;
-	try {
-		return decodeURIComponent(match[1]);
-	} catch {}
+	return decodeSegment(match[1]);
 };
 //#endregion
 export { unwrapPostmark };

package/dist/unwraps/proofpointV3.mjs

@@ -1,11 +1,12 @@
+import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 import { decodeBase64Url, getUtf8ByteLength } from "../utils.mjs";
 //#region src/unwraps/proofpointV3.ts
 const v3PathRegex = /^\/v3\/__(.+)__;([^!]*)!/;
-const v3HostSet = /* @__PURE__ */ new Set([
+const v3Hosts = [
 	"urldefense.com",
 	"urldefense.proofpoint.com",
 	"urldefense.us"
-]);
+];
 const runLengthMap = (() => {
 	const map = {};
 	const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
@@ -19,11 +20,11 @@ const decodeReplacements = (mangled, replacementBase64) => {
 	const replacementChars = Array.from(replacement);
 	const urlChars = Array.from(mangled);
 	const result = [];
-	const matcher = /(?<!\*)\*(?!\*)|\*{2}[A-Za-z0-9\-_]/g;
+	const markerRegex = /(?<!\*)\*(?!\*)|\*{2}[A-Za-z0-9\-_]/g;
 	let lastIndex = 0;
 	let savedBytes = 0;
 	let match;
-	match = matcher.exec(mangled);
+	match = markerRegex.exec(mangled);
 	while (match !== null) {
 		const startChar = positionInChars(mangled, match.index);
 		const endChar = positionInChars(mangled, match.index + match[0].length);
@@ -53,7 +54,7 @@ const decodeReplacements = (mangled, replacementBase64) => {
 			}
 		}
 		lastIndex = endChar;
-		match = matcher.exec(mangled);
+		match = markerRegex.exec(mangled);
 	}
 	for (let charIndex = lastIndex; charIndex < urlChars.length; charIndex += 1) result.push(urlChars[charIndex]);
 	return result.join("");
@@ -69,7 +70,7 @@ const positionInChars = (source, codeUnitIndex) => {
 	return charIndex;
 };
 const unwrapProofpointV3 = (url) => {
-	if (!v3HostSet.has(url.hostname)) return;
+	if (!isHostOf(url, v3Hosts)) return;
 	const match = `${url.pathname}${url.search}`.match(v3PathRegex);
 	if (!match) return;
 	return decodeReplacements(match[1], match[2]);

package/dist/unwraps/webArchive.mjs

@@ -1,12 +1,11 @@
+import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/webArchive.ts
 const pathRegex = /^\/web\/\d{14}\*?\/(.+)$/;
 const unwrapWebArchive = (url) => {
-	if (url.hostname !== "web.archive.org") return;
+	if (!isHostOf(url, "web.archive.org")) return;
 	const match = url.pathname.match(pathRegex);
 	if (!match) return;
-	try {
-		return decodeURIComponent(match[1]);
-	} catch {}
+	return decodeSegment(match[1]);
 };
 //#endregion
 export { unwrapWebArchive };

package/dist/unwraps/yahooSearch.mjs

@@ -1,12 +1,11 @@
+import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/yahooSearch.ts
 const yahooPathRegex = /\/RU=([^/]+)\/RK=/;
 const unwrapYahooSearch = (url) => {
-	if (url.hostname !== "r.search.yahoo.com") return;
+	if (!isHostOf(url, "r.search.yahoo.com")) return;
 	const match = url.pathname.match(yahooPathRegex);
 	if (!match) return;
-	try {
-		return decodeURIComponent(match[1]);
-	} catch {}
+	return decodeSegment(match[1]);
 };
 //#endregion
 export { unwrapYahooSearch };

package/dist/utils.mjs

@@ -1,13 +1,12 @@
+import { isHostOf } from "./node_modules/trousse/dist/urls.mjs";
 //#region src/utils.ts
-const createHostMatcher = (hosts) => {
-	if (hosts instanceof RegExp) return (host) => hosts.test(host);
-	const hostSet = new Set(Array.isArray(hosts) ? hosts : [hosts]);
-	return (host) => hostSet.has(host);
+const matchesHost = (url, hosts) => {
+	if (hosts instanceof RegExp) return hosts.test(url.hostname);
+	return isHostOf(url, hosts);
 };
 const createParamExtractor = (config) => {
-	const matchesHost = createHostMatcher(config.hosts);
 	return (url) => {
-		if (!matchesHost(url.hostname)) return;
+		if (!matchesHost(url, config.hosts)) return;
 		if (config.path && url.pathname !== config.path) return;
 		for (const param of config.params) {
 			const value = url.searchParams.get(param);

package/package.json

@@ -41,9 +41,9 @@
   },
   "devDependencies": {
     "@types/bun": "^1.4.2",
-    "kvalita": "^1.23.0",
-    "trousse": "^2.2.1",
+    "kvalita": "^1.24.0",
+    "trousse": "^2.6.0",
     "tsdown": "^0.23.0"
   },
-  "version": "1.4.1"
+  "version": "1.4.2"
 }