trousse 3.1.0 → 3.2.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { omitEmpty } from "./arrays.js";
-import { AnyOf, DeepOmit, IsPlainObject, MaybePromise, NormalizeOptions, Nullish, ParamSource, PartialNullish, Pattern, RegistrableDomainOptions, WeightedMimeType } from "./types.js";
+import { AnyOf, DeepOmit, IsPlainObject, MaybePromise, NormalizeOptions, Nullish, ParamOptions, 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, webAudioExtensions, webImageExtensions, webVideoExtensions } from "./files.js";
 import { isBoolean, isFunction, isNonEmptyString, isNullish, isNumber, isObject, isPlainObject, isPresent, isString, isValidDate } from "./is.js";
@@ -10,4 +10,4 @@ import { createAcceptHeader, feedMimeTypes, genericFeedMimeTypes, genericHtmlMim
 import { omit, pick, toMap, trimObject } from "./objects.js";
 import { sleep } from "./timers.js";
 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, webAudioExtensions, webImageExtensions, webVideoExtensions };
+export { type AnyOf, type DeepOmit, type IsPlainObject, type MaybePromise, type NormalizeOptions, type Nullish, type ParamOptions, 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, webAudioExtensions, webImageExtensions, webVideoExtensions };

package/dist/types.d.ts

@@ -6,6 +6,11 @@ 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 ParamOptions = {
+  decodeValues?: boolean;
+  trimValues?: boolean;
+  preserveEmptyValues?: boolean;
+};
 export type RegistrableDomainOptions = {
   suffixes?: ReadonlyArray<string>;
 };

package/dist/urls.d.ts

@@ -1,4 +1,4 @@
-import { NormalizeOptions, Nullish, ParamSource, RegistrableDomainOptions } from "./types.js";
+import { NormalizeOptions, Nullish, ParamOptions, 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;
@@ -10,13 +10,13 @@ export declare const decodeSegment: (segment: string | undefined) => string | un
 export declare const decodePercent: (value: string) => string;
 export declare const encodePathSegment: (value: string) => string;
 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 getQueryParamValues: (source: ParamSource | undefined, name: string, options?: ParamOptions) => Array<string>;
+export declare const getQueryParam: (source: ParamSource | undefined, name: string, options?: ParamOptions) => string | undefined;
+export declare const getQueryParams: (source: ParamSource | undefined, names: ReadonlyArray<string>, options?: ParamOptions) => 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 getFragmentParamValues: (source: ParamSource | undefined, name: string, options?: ParamOptions) => Array<string>;
+export declare const getFragmentParam: (source: ParamSource | undefined, name: string, options?: ParamOptions) => string | undefined;
+export declare const getFragmentParams: (source: ParamSource | undefined, names: ReadonlyArray<string>, options?: ParamOptions) => 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;

package/dist/urls.js

@@ -94,37 +94,55 @@ const pathSegmentEscapeRegex = /[/?#\\\s]/g;
 const encodePathSegment = (value) => {
 	return value.replace(pathSegmentEscapeRegex, (character) => encodeURIComponent(character));
 };
-const readQuerySource = (source) => {
+const readRawPairs = (text, prefix) => {
+	if (text === void 0) return;
+	const pairs = [];
+	const body = text.startsWith(prefix) ? text.slice(1) : text;
+	for (const pair of body.split("&")) {
+		if (!pair) continue;
+		const separator = pair.indexOf("=");
+		if (separator === -1) {
+			pairs.push([decodePercent(pair.replaceAll("+", " ")), ""]);
+			continue;
+		}
+		const name = decodePercent(pair.slice(0, separator).replaceAll("+", " "));
+		pairs.push([name, pair.slice(separator + 1)]);
+	}
+	return pairs;
+};
+const readQuerySource = (source, options) => {
+	if (options?.decodeValues === false) return readRawPairs(source instanceof URL ? source.search : source?.toString(), "?");
 	if (source instanceof URL) return source.searchParams;
 	if (typeof source === "string") return new URLSearchParams(source);
 	return source;
 };
-const readFragmentSource = (source) => {
+const readFragmentSource = (source, options) => {
+	if (options?.decodeValues === false) return readRawPairs(source instanceof URL ? source.hash : source?.toString(), "#");
 	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 readParamValues = (params, name, options) => {
 	const values = [];
 	if (!params) return values;
 	const lowercaseName = name.toLowerCase();
 	for (const [key, value] of params) {
 		if (key.toLowerCase() !== lowercaseName) continue;
-		const trimmed = value.trim();
-		if (trimmed) values.push(trimmed);
+		const read = options?.trimValues === false ? value : value.trim();
+		if (read || options?.preserveEmptyValues) values.push(read);
 	}
 	return values;
 };
 const hasParam = (params, name) => {
 	if (!params) return false;
 	const lowercaseName = name.toLowerCase();
-	for (const key of params.keys()) if (key.toLowerCase() === lowercaseName) return true;
+	for (const [key] of params) if (key.toLowerCase() === lowercaseName) return true;
 	return false;
 };
-const readParams = (params, names) => {
+const readParams = (params, names, options) => {
 	const picked = {};
 	for (const name of names) {
-		const value = readParamValues(params, name)[0];
+		const value = readParamValues(params, name, options)[0];
 		if (value !== void 0) picked[name] = value;
 	}
 	return picked;
@@ -132,26 +150,26 @@ const readParams = (params, names) => {
 const hasQueryParam = (source, name) => {
 	return hasParam(readQuerySource(source), name);
 };
-const getQueryParamValues = (source, name) => {
-	return readParamValues(readQuerySource(source), name);
+const getQueryParamValues = (source, name, options) => {
+	return readParamValues(readQuerySource(source, options), name, options);
 };
-const getQueryParam = (source, name) => {
-	return getQueryParamValues(source, name)[0];
+const getQueryParam = (source, name, options) => {
+	return getQueryParamValues(source, name, options)[0];
 };
-const getQueryParams = (source, names) => {
-	return readParams(readQuerySource(source), names);
+const getQueryParams = (source, names, options) => {
+	return readParams(readQuerySource(source, options), names, options);
 };
 const hasFragmentParam = (source, name) => {
 	return hasParam(readFragmentSource(source), name);
 };
-const getFragmentParamValues = (source, name) => {
-	return readParamValues(readFragmentSource(source), name);
+const getFragmentParamValues = (source, name, options) => {
+	return readParamValues(readFragmentSource(source, options), name, options);
 };
-const getFragmentParam = (source, name) => {
-	return getFragmentParamValues(source, name)[0];
+const getFragmentParam = (source, name, options) => {
+	return getFragmentParamValues(source, name, options)[0];
 };
-const getFragmentParams = (source, names) => {
-	return readParams(readFragmentSource(source), names);
+const getFragmentParams = (source, names, options) => {
+	return readParams(readFragmentSource(source, options), names, options);
 };
 const queryPartEscapeRegex = /[&#%+\s]/g;
 const composePairs = (params) => {

package/package.json

@@ -46,5 +46,5 @@
   "dependencies": {
     "entities": "^8.1.0"
   },
-  "version": "3.1.0"
+  "version": "3.2.0"
 }