trousse 3.6.0 → 3.7.0

package/dist/urls.js

@@ -427,6 +427,18 @@ const resolveUrl = (url, base) => {
 	if (!parsed || !isHttpUrl(parsed)) return;
 	return parsed.href;
 };
+const valueShapeEscapeRegex = /(%(?:26|23|25|2B|3B))/gi;
+const nameShapeEscapeRegex = /(%(?:26|23|25|2B|3B|3D))/gi;
+const decodeQueryPart = (part, shapeRegex) => {
+	return part.replace(plusRegex, "%20").split(shapeRegex).map((chunk, index) => index % 2 ? chunk.toUpperCase() : decodePercent(chunk)).join("");
+};
+const canonicalizeQuery = (search) => {
+	return `?${search.slice(1).split("&").map((pair) => {
+		const at = pair.indexOf("=");
+		if (at === -1) return decodeQueryPart(pair, nameShapeEscapeRegex);
+		return `${decodeQueryPart(pair.slice(0, at), nameShapeEscapeRegex)}=${decodeQueryPart(pair.slice(at + 1), valueShapeEscapeRegex)}`;
+	}).join("&")}`;
+};
 const decodeAndNormalizeEncoding = (value) => {
 	if (!value.includes("%")) return value;
 	return value.replace(percentEscapeRegex, (hex) => {
@@ -471,7 +483,10 @@ const normalizeUrl = (url, options) => {
 		if (options.collapseSlashes) pathname = pathname.replace(repeatedSlashesRegex, "/");
 		if (options.stripTrailingSlash && pathname.length > 1 && pathname.endsWith("/")) pathname = pathname.slice(0, -1);
 		parsed.pathname = pathname;
-		if (options.normalizeEncoding && parsed.search.includes("%")) parsed.search = decodeAndNormalizeEncoding(parsed.search);
+		if (options.normalizeEncoding && parsed.search.length > 1) {
+			parsed.search = canonicalizeQuery(parsed.search);
+			parsed.search = parsed.search.replace(percentEscapeRegex, (hex) => hex.toUpperCase());
+		}
 		if (options.normalizeEncoding && parsed.hash.includes("%")) parsed.hash = decodeAndNormalizeEncoding(parsed.hash);
 		if (options.stripQuery) parsed.search = "";
 		if (parsed.search && (options.stripQueryParams || options.lowercaseQuery)) {
@@ -522,7 +537,15 @@ const createUrlVariants = (url) => {
 const sameQuerySpellings = [
 	["+", "%20"],
 	[":", "%3A"],
-	["@", "%40"]
+	["@", "%40"],
+	["/", "%2F"],
+	[",", "%2C"],
+	["(", "%28"],
+	[")", "%29"],
+	["*", "%2A"],
+	["!", "%21"],
+	["'", "%27"],
+	["$", "%24"]
 ];
 const percentEscapeRegex = /%[0-9a-f]{2}/gi;
 const addLowercaseHexSpellings = (url, spellings) => {
@@ -532,25 +555,34 @@ const addLowercaseHexSpellings = (url, spellings) => {
 	});
 	return [.../* @__PURE__ */ new Set([...spellings, ...lowercaseHexSpellings])];
 };
+const maxMixedQuerySpellings = 4;
+const respellQuery = (spelling, queryIndex, pairs, toEncoded) => {
+	const fragmentIndex = spelling.indexOf("#");
+	const queryEnd = fragmentIndex === -1 ? spelling.length : fragmentIndex;
+	let query = spelling.slice(queryIndex, queryEnd);
+	for (const [written, encoded] of pairs) query = toEncoded ? query.replaceAll(written, encoded) : query.replaceAll(encoded, written);
+	return `${spelling.slice(0, queryIndex)}${query}${spelling.slice(queryEnd)}`;
+};
 const createUrlSpellings = (url) => {
 	const uppercaseHexUrl = url.replace(percentEscapeRegex, (hex) => hex.toUpperCase());
-	let spellings = [.../* @__PURE__ */ new Set([url, uppercaseHexUrl])];
 	const hashIndex = url.indexOf("#");
 	const queryEnd = hashIndex === -1 ? url.length : hashIndex;
 	const queryIndex = url.indexOf("?");
-	if (queryIndex === -1 || queryIndex > queryEnd) return addLowercaseHexSpellings(url, spellings);
-	for (const [written, encoded] of sameQuerySpellings) {
-		const swapped = spellings.flatMap((spelling) => {
-			const fragmentIndex = spelling.indexOf("#");
-			const spellingQueryEnd = fragmentIndex === -1 ? spelling.length : fragmentIndex;
-			const head = spelling.slice(0, queryIndex);
-			const query = spelling.slice(queryIndex, spellingQueryEnd);
-			const fragment = spelling.slice(spellingQueryEnd);
-			return [`${head}${query.replaceAll(encoded, written)}${fragment}`, `${head}${query.replaceAll(written, encoded)}${fragment}`];
-		});
-		spellings = [...new Set(swapped)];
-	}
-	return addLowercaseHexSpellings(url, [url, ...spellings]);
+	if (queryIndex === -1 || queryIndex > queryEnd) return addLowercaseHexSpellings(url, [.../* @__PURE__ */ new Set([url, uppercaseHexUrl])]);
+	const query = uppercaseHexUrl.slice(queryIndex, queryEnd);
+	const present = sameQuerySpellings.filter(([written, encoded]) => {
+		return query.includes(written) || query.includes(encoded);
+	});
+	const bases = [.../* @__PURE__ */ new Set([url, uppercaseHexUrl])];
+	const throughout = bases.flatMap((base) => [respellQuery(base, queryIndex, present, false), respellQuery(base, queryIndex, present, true)]);
+	let mixes = bases;
+	if (present.length <= maxMixedQuerySpellings) for (const pair of present) mixes = mixes.flatMap((spelling) => [respellQuery(spelling, queryIndex, [pair], false), respellQuery(spelling, queryIndex, [pair], true)]);
+	return addLowercaseHexSpellings(url, [.../* @__PURE__ */ new Set([
+		url,
+		uppercaseHexUrl,
+		...throughout,
+		...mixes
+	])]);
 };
 const genericSecondLevels = [
 	"ac",

package/package.json

@@ -46,5 +46,5 @@
   "dependencies": {
     "entities": "^8.1.0"
   },
-  "version": "3.6.0"
+  "version": "3.7.0"
 }