trousse 2.16.3 → 3.0.0

package/dist/arrays.js

@@ -3,6 +3,7 @@ import { isPresent } from "./is.js";
 const omitEmpty = (array) => {
 	const result = [];
 	for (const item of array) if (isPresent(item) && item !== "") result.push(item);
-	return result.length ? result : void 0;
+	if (!result.length) return;
+	return result;
 };
 export { omitEmpty };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { omitEmpty } from "./arrays.js";
-import { AnyOf, DeepOmit, IsPlainObject, MaybePromise, NormalizeOptions, Nullish, PartialNullish, Pattern, RegistrableDomainOptions, WeightedMimeType } from "./types.js";
+import { AnyOf, DeepOmit, IsPlainObject, MaybePromise, NormalizeOptions, Nullish, ParamSource, PartialNullish, Pattern, RegistrableDomainOptions, WeightedMimeType } from "./types.js";
 import { coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString } from "./coercions.js";
 import { archiveExtensions, audioExtensions, codeExtensions, documentExtensions, flashExtensions, fontExtensions, imageExtensions, installerExtensions, subtitleExtensions, videoExtensions } from "./files.js";
 import { isBoolean, isFunction, isNonEmptyString, isNullish, isNumber, isObject, isPlainObject, isPresent, isString, isValidDate } from "./is.js";
@@ -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, composeQuery, createUrlSpellings, createUrlVariants, decodePercent, 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, decodePercent, 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 };
+import { addMissingProtocol, addMissingScheme, composeFragment, composeQuery, createUrlSpellings, createUrlVariants, decodePercent, decodeSegment, encodePathSegment, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, getFragmentParam, getFragmentParamValues, getFragmentParams, getPathSegments, getQueryParam, getQueryParamValues, getQueryParams, getRegistrableDomain, getSubdomain, hasFragmentParam, hasQueryParam, 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 ParamSource, type PartialNullish, type Pattern, type RegistrableDomainOptions, type WeightedMimeType, addMissingProtocol, addMissingScheme, anyWordMatchesAnyOf, archiveExtensions, audioExtensions, codeExtensions, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, composeFragment, composeQuery, createAcceptHeader, createUrlSpellings, createUrlVariants, decodePercent, decodeSegment, documentExtensions, encodePathSegment, endsWithAnyOf, escapeHtml, escapeRegex, feedMimeTypes, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, flashExtensions, fontExtensions, genericFeedMimeTypes, genericHtmlMimeTypes, getAnyOf, getFragmentParam, getFragmentParamValues, getFragmentParams, getPathSegments, getQueryParam, getQueryParamValues, getQueryParams, getRegistrableDomain, getSubdomain, hasFragmentParam, hasQueryParam, 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, composeQuery, createUrlSpellings, createUrlVariants, decodePercent, 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, decodePercent, 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 };
+import { addMissingProtocol, addMissingScheme, composeFragment, composeQuery, createUrlSpellings, createUrlVariants, decodePercent, decodeSegment, encodePathSegment, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, getFragmentParam, getFragmentParamValues, getFragmentParams, getPathSegments, getQueryParam, getQueryParamValues, getQueryParams, getRegistrableDomain, getSubdomain, hasFragmentParam, hasQueryParam, 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, composeFragment, composeQuery, createAcceptHeader, createUrlSpellings, createUrlVariants, decodePercent, decodeSegment, documentExtensions, encodePathSegment, endsWithAnyOf, escapeHtml, escapeRegex, feedMimeTypes, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, flashExtensions, fontExtensions, genericFeedMimeTypes, genericHtmlMimeTypes, getAnyOf, getFragmentParam, getFragmentParamValues, getFragmentParams, getPathSegments, getQueryParam, getQueryParamValues, getQueryParams, getRegistrableDomain, getSubdomain, hasFragmentParam, hasQueryParam, 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/types.d.ts

@@ -5,6 +5,7 @@ export type Nullish<T> = T | null | undefined;
 export type PartialNullish<T> = { [Key in keyof T]?: Nullish<T[Key]>; };
 export type MaybePromise<T> = T | Promise<T>;
 export type Pattern = string | RegExp;
+export type ParamSource = URL | URLSearchParams | string;
 export type RegistrableDomainOptions = {
   suffixes?: ReadonlyArray<string>;
 };

package/dist/urls.d.ts

@@ -1,4 +1,4 @@
-import { NormalizeOptions, Nullish, RegistrableDomainOptions } from "./types.js";
+import { NormalizeOptions, Nullish, ParamSource, RegistrableDomainOptions } from "./types.js";
 export declare const parseUrl: (value: Nullish<string | URL>, base?: string | URL) => URL | undefined;
 export declare const getPathSegments: (value: string | URL) => Array<string>;
 export declare const isHostOf: (url: string | URL, hosts: string | ReadonlyArray<string>) => boolean;
@@ -9,9 +9,16 @@ export declare const getSubdomain: (url: string | URL, domains: string | Readonl
 export declare const decodeSegment: (segment: string | undefined) => string | undefined;
 export declare const decodePercent: (value: string) => string;
 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 hasQueryParam: (source: ParamSource | undefined, name: string) => boolean;
+export declare const getQueryParamValues: (source: ParamSource | undefined, name: string) => Array<string>;
+export declare const getQueryParam: (source: ParamSource | undefined, name: string) => string | undefined;
+export declare const getQueryParams: (source: ParamSource | undefined, names: ReadonlyArray<string>) => Record<string, string>;
+export declare const hasFragmentParam: (source: ParamSource | undefined, name: string) => boolean;
+export declare const getFragmentParamValues: (source: ParamSource | undefined, name: string) => Array<string>;
+export declare const getFragmentParam: (source: ParamSource | undefined, name: string) => string | undefined;
+export declare const getFragmentParams: (source: ParamSource | undefined, names: ReadonlyArray<string>) => Record<string, string>;
 export declare const composeQuery: (params?: Record<string, string | number>) => string;
+export declare const composeFragment: (params?: Record<string, string | number>) => string;
 export declare const fixMalformedScheme: (url: string) => string;
 export declare const fixMalformedQuery: (url: string) => string;
 export declare const trimUrlValues: (url: string) => string;

package/dist/urls.js

@@ -94,25 +94,85 @@ const pathSegmentEscapeRegex = /[/?#\\\s]/g;
 const encodePathSegment = (value) => {
 	return value.replace(pathSegmentEscapeRegex, (character) => encodeURIComponent(character));
 };
-const getQueryParams = (params, name) => {
+const readQuerySource = (source) => {
+	if (source instanceof URL) return source.searchParams;
+	if (typeof source === "string") return new URLSearchParams(source);
+	return source;
+};
+const readFragmentSource = (source) => {
+	if (source instanceof URL) return new URLSearchParams(source.hash.slice(1));
+	if (typeof source === "string") return new URLSearchParams(source.startsWith("#") ? source.slice(1) : source);
+	return source;
+};
+const readParamValues = (params, name) => {
 	const values = [];
 	if (!params) return values;
 	const lowercaseName = name.toLowerCase();
-	for (const [key, value] of params) if (key.toLowerCase() === lowercaseName) values.push(value);
+	for (const [key, value] of params) {
+		if (key.toLowerCase() !== lowercaseName) continue;
+		const trimmed = value.trim();
+		if (trimmed) values.push(trimmed);
+	}
 	return values;
 };
-const getQueryParam = (params, name) => {
-	return getQueryParams(params, name)[0];
+const hasParam = (params, name) => {
+	if (!params) return false;
+	const lowercaseName = name.toLowerCase();
+	for (const key of params.keys()) if (key.toLowerCase() === lowercaseName) return true;
+	return false;
+};
+const readParams = (params, names) => {
+	const picked = {};
+	for (const name of names) {
+		const value = readParamValues(params, name)[0];
+		if (value !== void 0) picked[name] = value;
+	}
+	return picked;
+};
+const hasQueryParam = (source, name) => {
+	return hasParam(readQuerySource(source), name);
+};
+const getQueryParamValues = (source, name) => {
+	return readParamValues(readQuerySource(source), name);
+};
+const getQueryParam = (source, name) => {
+	return getQueryParamValues(source, name)[0];
+};
+const getQueryParams = (source, names) => {
+	return readParams(readQuerySource(source), names);
+};
+const hasFragmentParam = (source, name) => {
+	return hasParam(readFragmentSource(source), name);
+};
+const getFragmentParamValues = (source, name) => {
+	return readParamValues(readFragmentSource(source), name);
+};
+const getFragmentParam = (source, name) => {
+	return getFragmentParamValues(source, name)[0];
+};
+const getFragmentParams = (source, names) => {
+	return readParams(readFragmentSource(source), names);
 };
 const queryPartEscapeRegex = /[&#%+\s]/g;
-const composeQuery = (params) => {
+const composePairs = (params) => {
 	const escapePart = (part) => {
 		return part.replace(queryPartEscapeRegex, (character) => encodeURIComponent(character));
 	};
-	const pairs = Object.entries(params ?? {}).map(([name, value]) => {
-		return `${escapePart(name)}=${escapePart(String(value))}`;
-	});
-	return pairs.length > 0 ? `?${pairs.join("&")}` : "";
+	const pairs = [];
+	for (const [name, value] of Object.entries(params ?? {})) {
+		const text = String(value);
+		if (!text) continue;
+		pairs.push(`${escapePart(name)}=${escapePart(text)}`);
+	}
+	return pairs.join("&");
+};
+const composeQuery = (params) => {
+	const pairs = composePairs(params);
+	return pairs ? `?${pairs}` : "";
+};
+const composeFragment = (params) => {
+	const pairs = composePairs(params);
+	return pairs ? `#${pairs}` : "";
 };
 const strippedParamsCache = /* @__PURE__ */ new WeakMap();
 const getStrippedParamsSet = (params) => {
@@ -183,6 +243,24 @@ const httpOrSchemeRelativeRegex = /^(?:https?:)?\/\//i;
 const slugTailRegex = /[/.-]/;
 const lostSeparatorRegex = /(?<!\s)\s+(?=[A-Za-z_][\w.-]*=)/g;
 const slashClosedValueRegex = /(=[^&/=]+)\/+(?=&|$)/g;
+const fixFragmentPairs = (fragment) => {
+	const nestedOffset = fragment.search(nestedUrlRegex);
+	const ownEnd = nestedOffset === -1 ? fragment.length : nestedOffset;
+	let fixed = "";
+	let hasValue = false;
+	for (let index = 0; index < ownEnd; index++) {
+		const character = fragment[index];
+		if (character === "?" && hasValue) {
+			fixed += "&";
+			hasValue = false;
+			continue;
+		}
+		if (character === "&") hasValue = false;
+		if (character === "=") hasValue = true;
+		fixed += character;
+	}
+	return `${fixed}${fragment.slice(ownEnd)}`;
+};
 const isGlueTail = (head, glueIndex, pathEnd) => {
 	const tail = head.slice(glueIndex + 1, pathEnd).split("&")[0] ?? "";
 	return tail.includes("=") || !slugTailRegex.test(tail);
@@ -192,7 +270,7 @@ const fixMalformedQuery = (url) => {
 	const hashIndex = url.indexOf("#");
 	const hasFragment = hashIndex !== -1;
 	const head = hasFragment ? url.slice(0, hashIndex) : url;
-	const fragment = hasFragment ? url.slice(hashIndex) : "";
+	const fragment = hasFragment ? fixFragmentPairs(url.slice(hashIndex)) : "";
 	const authorityEnd = head.indexOf("//") + 2;
 	const nestedOffset = head.slice(authorityEnd).search(nestedUrlRegex);
 	const hasNestedUrl = nestedOffset !== -1;
@@ -203,7 +281,7 @@ const fixMalformedQuery = (url) => {
 	const pathEnd = hasMark ? markIndex : ownEnd;
 	const glueIndex = pathIndex !== -1 && pathIndex < pathEnd ? head.indexOf("&", pathIndex) : -1;
 	const isGlued = glueIndex !== -1 && glueIndex < pathEnd && isGlueTail(head, glueIndex, pathEnd);
-	if (!isGlued && !hasMark) return url;
+	if (!isGlued && !hasMark) return `${head}${fragment}`;
 	const queryIndex = isGlued ? glueIndex : markIndex;
 	const queryStart = queryIndex + (isGlued && head[glueIndex + 1] === "?" ? 2 : 1);
 	let query = "";
@@ -229,24 +307,25 @@ const valueEdgeSpaceRegex = new RegExp(`^${valueEdgeSpace}+|(?<!${valueEdgeSpace
 const trimEdgeSpace = (value, regex) => {
 	return value.replace(regex, "") || value;
 };
-const trimPairValue = (pair) => {
+const trimPairValue = (pair, regex) => {
 	const equalsIndex = pair.indexOf("=");
 	if (equalsIndex === -1) return pair;
-	const value = trimEdgeSpace(pair.slice(equalsIndex + 1), valueEdgeSpaceRegex);
+	const value = trimEdgeSpace(pair.slice(equalsIndex + 1), regex);
 	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 query = markIndex === -1 ? "" : `?${pairs.map((pair) => trimPairValue(pair, valueEdgeSpaceRegex)).join("&")}`;
+	const fragmentPairs = hashIndex === -1 ? [] : url.slice(hashIndex + 1).split("&");
+	return `${authority}${path}${query}${hashIndex === -1 ? "" : `#${fragmentPairs.map((pair) => trimPairValue(pair, segmentEdgeSpaceRegex)).join("&")}`}`;
 };
 const feedSchemes = [
 	"feed:",
@@ -514,4 +593,4 @@ const resolveFeedProtocol = resolveFeedScheme;
 const addMissingProtocol = addMissingScheme;
 /** @deprecated Use `upgradeScheme` instead. */
 const upgradeProtocol = upgradeScheme;
-export { addMissingProtocol, addMissingScheme, composeQuery, createUrlSpellings, createUrlVariants, decodePercent, decodeSegment, encodePathSegment, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, getPathSegments, getQueryParam, getQueryParams, getRegistrableDomain, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, resolveFeedProtocol, resolveFeedScheme, resolveUrl, stripWww, trimUrlValues, upgradeProtocol, upgradeScheme };
+export { addMissingProtocol, addMissingScheme, composeFragment, composeQuery, createUrlSpellings, createUrlVariants, decodePercent, decodeSegment, encodePathSegment, fixMalformedProtocol, fixMalformedQuery, fixMalformedScheme, getFragmentParam, getFragmentParamValues, getFragmentParams, getPathSegments, getQueryParam, getQueryParamValues, getQueryParams, getRegistrableDomain, getSubdomain, hasFragmentParam, hasQueryParam, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, resolveFeedProtocol, resolveFeedScheme, resolveUrl, stripWww, trimUrlValues, upgradeProtocol, upgradeScheme };

package/package.json

@@ -40,11 +40,11 @@
   },
   "devDependencies": {
     "@types/bun": "^1.4.2",
-    "kvalita": "^1.28.0",
+    "kvalita": "^1.30.0",
     "tsdown": "0.23.1"
   },
   "dependencies": {
     "entities": "^8.1.0"
   },
-  "version": "2.16.3"
+  "version": "3.0.0"
 }