trousse 2.12.0 → 2.14.0

package/dist/index.d.ts

@@ -9,5 +9,5 @@ import { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, getAnyOf, includesAnyO
 import { createAcceptHeader, feedMimeTypes, genericFeedMimeTypes, genericHtmlMimeTypes, htmlMimeTypes } from "./mimes.js";
 import { omit, pick, toMap, trimObject } from "./objects.js";
 import { sleep } from "./timers.js";
-import { addMissingProtocol, addMissingScheme, createUrlVariants, decodeSegment, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, resolveFeedProtocol, resolveFeedScheme, resolveUrl, stripWww, upgradeProtocol, upgradeScheme } from "./urls.js";
-export { type AnyOf, type DeepOmit, type IsPlainObject, type MaybePromise, type NormalizeOptions, type Nullish, type PartialNullish, type Pattern, type RegistrableDomainOptions, type WeightedMimeType, addMissingProtocol, addMissingScheme, anyWordMatchesAnyOf, archiveExtensions, audioExtensions, codeExtensions, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, createAcceptHeader, createUrlVariants, decodeSegment, documentExtensions, endsWithAnyOf, escapeHtml, escapeRegex, feedMimeTypes, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, flashExtensions, fontExtensions, genericFeedMimeTypes, genericHtmlMimeTypes, getAnyOf, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, htmlMimeTypes, imageExtensions, includesAnyOf, installerExtensions, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, normalizeUrl, omit, omitEmpty, parseUrl, pick, resolveFeedProtocol, resolveFeedScheme, resolveUrl, sleep, startsWithAnyOf, stripWww, subtitleExtensions, t, toMap, trimObject, tx, upgradeProtocol, upgradeScheme, videoExtensions };
+import { addMissingProtocol, addMissingScheme, composeQuery, createUrlSpellings, createUrlVariants, decodeSegment, encodePathSegment, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, resolveFeedProtocol, resolveFeedScheme, resolveUrl, stripWww, trimUrlValues, upgradeProtocol, upgradeScheme } from "./urls.js";
+export { type AnyOf, type DeepOmit, type IsPlainObject, type MaybePromise, type NormalizeOptions, type Nullish, type PartialNullish, type Pattern, type RegistrableDomainOptions, type WeightedMimeType, addMissingProtocol, addMissingScheme, anyWordMatchesAnyOf, archiveExtensions, audioExtensions, codeExtensions, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, composeQuery, createAcceptHeader, createUrlSpellings, createUrlVariants, decodeSegment, documentExtensions, encodePathSegment, endsWithAnyOf, escapeHtml, escapeRegex, feedMimeTypes, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, flashExtensions, fontExtensions, genericFeedMimeTypes, genericHtmlMimeTypes, getAnyOf, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, htmlMimeTypes, imageExtensions, includesAnyOf, installerExtensions, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, normalizeUrl, omit, omitEmpty, parseUrl, pick, resolveFeedProtocol, resolveFeedScheme, resolveUrl, sleep, startsWithAnyOf, stripWww, subtitleExtensions, t, toMap, trimObject, trimUrlValues, tx, upgradeProtocol, upgradeScheme, videoExtensions };

package/dist/index.js

@@ -8,5 +8,5 @@ import { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, getAnyOf, includesAnyO
 import { createAcceptHeader, feedMimeTypes, genericFeedMimeTypes, genericHtmlMimeTypes, htmlMimeTypes } from "./mimes.js";
 import { omit, pick, toMap, trimObject } from "./objects.js";
 import { sleep } from "./timers.js";
-import { addMissingProtocol, addMissingScheme, createUrlVariants, decodeSegment, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, resolveFeedProtocol, resolveFeedScheme, resolveUrl, stripWww, upgradeProtocol, upgradeScheme } from "./urls.js";
-export { addMissingProtocol, addMissingScheme, anyWordMatchesAnyOf, archiveExtensions, audioExtensions, codeExtensions, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, createAcceptHeader, createUrlVariants, decodeSegment, documentExtensions, endsWithAnyOf, escapeHtml, escapeRegex, feedMimeTypes, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, flashExtensions, fontExtensions, genericFeedMimeTypes, genericHtmlMimeTypes, getAnyOf, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, htmlMimeTypes, imageExtensions, includesAnyOf, installerExtensions, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, normalizeUrl, omit, omitEmpty, parseUrl, pick, resolveFeedProtocol, resolveFeedScheme, resolveUrl, sleep, startsWithAnyOf, stripWww, subtitleExtensions, t, toMap, trimObject, tx, upgradeProtocol, upgradeScheme, videoExtensions };
+import { addMissingProtocol, addMissingScheme, composeQuery, createUrlSpellings, createUrlVariants, decodeSegment, encodePathSegment, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, resolveFeedProtocol, resolveFeedScheme, resolveUrl, stripWww, trimUrlValues, upgradeProtocol, upgradeScheme } from "./urls.js";
+export { addMissingProtocol, addMissingScheme, anyWordMatchesAnyOf, archiveExtensions, audioExtensions, codeExtensions, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, composeQuery, createAcceptHeader, createUrlSpellings, createUrlVariants, decodeSegment, documentExtensions, encodePathSegment, endsWithAnyOf, escapeHtml, escapeRegex, feedMimeTypes, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, flashExtensions, fontExtensions, genericFeedMimeTypes, genericHtmlMimeTypes, getAnyOf, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, htmlMimeTypes, imageExtensions, includesAnyOf, installerExtensions, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, normalizeUrl, omit, omitEmpty, parseUrl, pick, resolveFeedProtocol, resolveFeedScheme, resolveUrl, sleep, startsWithAnyOf, stripWww, subtitleExtensions, t, toMap, trimObject, trimUrlValues, tx, upgradeProtocol, upgradeScheme, videoExtensions };

package/dist/urls.d.ts

@@ -8,10 +8,13 @@ export declare const isHttpUrl: (url: string | URL) => boolean;
 export declare const isHostOrSubdomainOf: (url: string | URL, domains: string | ReadonlyArray<string>) => boolean;
 export declare const getSubdomain: (url: string | URL, domains: string | ReadonlyArray<string>) => string | undefined;
 export declare const decodeSegment: (segment: string | undefined) => string | undefined;
+export declare const encodePathSegment: (value: string) => string;
 export declare const getQueryParams: (params: URLSearchParams | undefined, name: string) => Array<string>;
 export declare const getQueryParam: (params: URLSearchParams | undefined, name: string) => string | undefined;
+export declare const composeQuery: (params?: Record<string, string>) => string;
 export declare const fixMalformedScheme: (url: string) => string;
 export declare const fixMalformedQuery: (url: string) => string;
+export declare const trimUrlValues: (url: string) => string;
 export declare const resolveFeedScheme: (url: string, scheme?: 'http' | 'https') => string;
 export declare const addMissingScheme: (url: string, scheme?: 'http' | 'https') => string;
 export declare const upgradeScheme: (url: string, scheme?: 'http' | 'https') => string;
@@ -20,6 +23,7 @@ export declare const normalizeUrl: (url: string, options: NormalizeOptions) => s
 export declare const stripWww: (hostname: string) => string;
 export declare const isIpAddress: (hostname: string) => boolean;
 export declare const createUrlVariants: (url: string) => Array<string>;
+export declare const createUrlSpellings: (url: string) => Array<string>;
 export declare const getRegistrableDomain: (url: string | URL, options?: RegistrableDomainOptions) => string | undefined;
 /** @deprecated Use `fixMalformedScheme` instead. */
 export declare const fixMalformedProtocol: typeof fixMalformedScheme;

package/dist/urls.js

@@ -57,6 +57,10 @@ const decodeSegment = (segment) => {
 		return decodeURIComponent(segment);
 	} catch {}
 };
+const pathSegmentEscapeRegex = /[/?#\\\s]/g;
+const encodePathSegment = (value) => {
+	return value.replace(pathSegmentEscapeRegex, (character) => encodeURIComponent(character));
+};
 const getQueryParams = (params, name) => {
 	const values = [];
 	if (!params) return values;
@@ -67,6 +71,16 @@ const getQueryParams = (params, name) => {
 const getQueryParam = (params, name) => {
 	return getQueryParams(params, name)[0];
 };
+const queryPartEscapeRegex = /[&#%+\s]/g;
+const composeQuery = (params) => {
+	const escapePart = (part) => {
+		return part.replace(queryPartEscapeRegex, (character) => encodeURIComponent(character));
+	};
+	const pairs = Object.entries(params ?? {}).map(([name, value]) => {
+		return `${escapePart(name)}=${escapePart(value)}`;
+	});
+	return pairs.length > 0 ? `?${pairs.join("&")}` : "";
+};
 const strippedParamsCache = /* @__PURE__ */ new WeakMap();
 const getStrippedParamsSet = (params) => {
 	let cached = strippedParamsCache.get(params);
@@ -169,6 +183,32 @@ const fixMalformedQuery = (url) => {
 	if (!hasNestedUrl) query = query.replace(lostSeparatorRegex, "&").replace(slashClosedValueRegex, "$1");
 	return `${head.slice(0, queryIndex)}?${query}${head.slice(ownEnd)}${fragment}`;
 };
+const segmentEdgeSpace = "(?:\\s|%(?:09|0A|0D|20))";
+const valueEdgeSpace = "(?:\\s|\\+|%(?:09|0A|0D|20))";
+const segmentEdgeSpaceRegex = new RegExp(`^${segmentEdgeSpace}+|(?<!${segmentEdgeSpace})${segmentEdgeSpace}+$`, "gi");
+const valueEdgeSpaceRegex = new RegExp(`^${valueEdgeSpace}+|(?<!${valueEdgeSpace})${valueEdgeSpace}+$`, "gi");
+const trimEdgeSpace = (value, regex) => {
+	return value.replace(regex, "") || value;
+};
+const trimPairValue = (pair) => {
+	const equalsIndex = pair.indexOf("=");
+	if (equalsIndex === -1) return pair;
+	const value = trimEdgeSpace(pair.slice(equalsIndex + 1), valueEdgeSpaceRegex);
+	return `${pair.slice(0, equalsIndex + 1)}${value}`;
+};
+const trimUrlValues = (url) => {
+	if (!httpOrSchemeRelativeRegex.test(url)) return url;
+	const hashIndex = url.indexOf("#");
+	const head = hashIndex === -1 ? url : url.slice(0, hashIndex);
+	const fragment = hashIndex === -1 ? "" : url.slice(hashIndex);
+	const markIndex = head.indexOf("?");
+	const beforeQuery = markIndex === -1 ? head : head.slice(0, markIndex);
+	const pathIndex = beforeQuery.indexOf("/", beforeQuery.indexOf("//") + 2);
+	const authority = pathIndex === -1 ? beforeQuery : beforeQuery.slice(0, pathIndex);
+	const path = (pathIndex === -1 ? [] : beforeQuery.slice(pathIndex).split("/")).map((segment) => trimEdgeSpace(segment, segmentEdgeSpaceRegex)).join("/");
+	const pairs = markIndex === -1 ? [] : head.slice(markIndex + 1).split("&");
+	return `${authority}${path}${markIndex === -1 ? "" : `?${pairs.map(trimPairValue).join("&")}`}${fragment}`;
+};
 const feedSchemes = [
 	"feed:",
 	"rss:",
@@ -336,6 +376,27 @@ const createUrlVariants = (url) => {
 	}
 	return variants;
 };
+const sameQuerySpellings = [
+	["+", "%20"],
+	[":", "%3A"],
+	["@", "%40"]
+];
+const percentEscapeRegex = /%[0-9a-f]{2}/gi;
+const createUrlSpellings = (url) => {
+	const spellings = [url, url.replace(percentEscapeRegex, (hex) => hex.toUpperCase())];
+	const hashIndex = url.indexOf("#");
+	const queryEnd = hashIndex === -1 ? url.length : hashIndex;
+	const queryIndex = url.indexOf("?");
+	if (queryIndex === -1 || queryIndex > queryEnd) return [...new Set(spellings)];
+	const head = url.slice(0, queryIndex);
+	const query = url.slice(queryIndex, queryEnd);
+	const fragment = url.slice(queryEnd);
+	for (const [written, encoded] of sameQuerySpellings) {
+		spellings.push(`${head}${query.replaceAll(written, encoded)}${fragment}`);
+		spellings.push(`${head}${query.replaceAll(encoded, written)}${fragment}`);
+	}
+	return [...new Set(spellings)];
+};
 const genericSecondLevels = [
 	"ac",
 	"co",
@@ -405,4 +466,4 @@ const addMissingProtocol = addMissingScheme;
 /** @deprecated Use `upgradeScheme` instead. */
 const upgradeProtocol = upgradeScheme;
 //#endregion
-export { addMissingProtocol, addMissingScheme, createUrlVariants, decodeSegment, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, resolveFeedProtocol, resolveFeedScheme, resolveUrl, stripWww, upgradeProtocol, upgradeScheme };
+export { addMissingProtocol, addMissingScheme, composeQuery, createUrlSpellings, createUrlVariants, decodeSegment, encodePathSegment, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, resolveFeedProtocol, resolveFeedScheme, resolveUrl, stripWww, trimUrlValues, upgradeProtocol, upgradeScheme };

package/package.json

@@ -46,5 +46,5 @@
   "dependencies": {
     "entities": "^8.1.0"
   },
-  "version": "2.12.0"
+  "version": "2.14.0"
 }