urlpurify 2.1.0 → 2.1.2

package/README.md

@@ -39,7 +39,7 @@ cleanUrl(url, {
   // Names, or regexes tested on the lowercased name.
   trackingParams: [...defaultTrackingParams, 'newsletter_id', /^cmp_[a-z0-9_]+$/],
   // The default.
-  maxUnwrapDepth: 6,
+  maxUnwrapDepth: 12,
 })
 ```
 

package/dist/clean.mjs

@@ -1,4 +1,4 @@
-import { fixMalformedProtocol, isHttpUrl, isIpAddress, normalizeUrl, parseUrl, stripWww } from "./node_modules/trousse/dist/urls.mjs";
+import { fixMalformedScheme, isHttpUrl, isIpAddress, normalizeUrl, parseUrl, stripWww } from "./node_modules/trousse/dist/urls.mjs";
 import { defaultTrackingParams, defaultUnwrappers } from "./defaults.mjs";
 //#region src/clean.ts
 const refDelimitersRegex = /[\s/?#\\:@]/;
@@ -53,7 +53,7 @@ const dottedHostRegex = /[^.]\.[^.]/;
 const fileExtensionHostRegex = /\.(?:asp|aspx|cgi|htm|html|jsp|jspa|php)$/;
 const cleanTarget = (target) => {
 	if (!target) return;
-	const repaired = fixMalformedProtocol(target.trim());
+	const repaired = fixMalformedScheme(target.trim());
 	if (controlCharactersRegex.test(repaired)) return;
 	const hostname = parseUrl(repaired)?.hostname ?? "";
 	if (!dottedHostRegex.test(hostname) && !isIpAddress(hostname)) return;
@@ -70,7 +70,8 @@ const addMissingScheme = (target) => {
 };
 const applyUnwrappers = (url, unwrappers) => {
 	for (const unwrap of unwrappers) {
-		const raw = addMissingScheme(unwrap(url)?.trim());
+		const unwrapped = addMissingScheme(unwrap(url)?.trim());
+		const raw = unwrapped && !isHttpUrl(unwrapped) ? fixMalformedScheme(unwrapped) : unwrapped;
 		if (!raw || !isHttpUrl(raw)) continue;
 		const target = cleanTarget(raw);
 		if (target) return target;
@@ -95,7 +96,7 @@ const stripTrackingParams = (url, trackingParams = defaultTrackingParams) => {
 const cleanUrl = (url, options) => {
 	const unwrappers = options?.unwrappers ?? defaultUnwrappers;
 	const trackingParams = options?.trackingParams ?? defaultTrackingParams;
-	const maxUnwrapDepth = options?.maxUnwrapDepth ?? 6;
+	const maxUnwrapDepth = options?.maxUnwrapDepth ?? 12;
 	const parsed = parseUrl(url);
 	if (!parsed) return url;
 	let currentParsed = parsed;

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

@@ -102,7 +102,8 @@ const relativeLeadChars = [
 const localhostRegex = /^localhost(?:[:/?#]|$)/i;
 const validUrlRegex = /^https?:\/\/(?:www\.|[a-vx-z0-9])/i;
 const schemeSeparator = String.raw`\.*[:\s=\\/][:\s=.\\/]*`;
-const leadingSchemeSeparator = String.raw`\.*(?::[:\s=.\\/]*|[\s=\\/][:\s=.\\/]+)`;
+const separatorChar = String.raw`(?:[:\s=.\\/]|%20|%c2%a0)`;
+const leadingSchemeSeparator = String.raw`\.*(?::${separatorChar}*|[\s=\\/]${separatorChar}+)`;
 const doubledSchemeRegex = /* @__PURE__ */ new RegExp(String.raw`^\/?[htps]{2,7}${leadingSchemeSeparator}([htps]{2,7})(?!:\d|[^/?#\\]*@)(${schemeSeparator})[.,:/]*(www[./]+)?`, "i");
 const singleMalformedRegex = /* @__PURE__ */ new RegExp(String.raw`^\/?(h[htps():]{1,10}|t{1,2}ps?)(${leadingSchemeSeparator})[.,:/]*(www[./]+)?`, "i");
 const isSchemeToken = (token, separator) => {
@@ -227,9 +228,7 @@ const stripWww = (hostname) => {
 const isIpAddress = (hostname) => {
 	return ipv4Regex.test(hostname) || ipv6Regex.test(hostname.replace(ipv6BracketsRegex, ""));
 };
-/** @deprecated Use `fixMalformedScheme` instead. */
-const fixMalformedProtocol = fixMalformedScheme;
 /** @deprecated Use `addMissingScheme` instead. */
 const addMissingProtocol = addMissingScheme;
 //#endregion
-export { addMissingProtocol, addMissingScheme, decodePercent, fixMalformedProtocol, fixMalformedScheme, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, stripWww };
+export { addMissingProtocol, addMissingScheme, decodePercent, fixMalformedScheme, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, stripWww };

package/package.json

@@ -42,8 +42,8 @@
   "devDependencies": {
     "@types/bun": "^1.4.2",
     "kvalita": "^1.24.3",
-    "trousse": "^2.15.0",
+    "trousse": "^2.15.1",
     "tsdown": "^0.23.0"
   },
-  "version": "2.1.0"
+  "version": "2.1.2"
 }