trousse 2.15.1 → 2.16.1

package/dist/arrays.d.ts

@@ -1,3 +1 @@
-//#region src/arrays.d.ts
-export declare const omitEmpty: <T>(array: Array<T | null | undefined>) => Array<T> | undefined;
-//#endregion
+export declare const omitEmpty: <T>(array: Array<T | null | undefined>) => Array<T> | undefined;

package/dist/arrays.js

@@ -1,9 +1,8 @@
 import { isPresent } from "./is.js";
-//#region src/arrays.ts
+// src/arrays.ts
 const omitEmpty = (array) => {
 	const result = [];
 	for (const item of array) if (isPresent(item) && item !== "") result.push(item);
 	return result.length ? result : void 0;
 };
-//#endregion
 export { omitEmpty };

package/dist/coercions.d.ts

@@ -1,9 +1,7 @@
 import { Nullish } from "./types.js";
-//#region src/coercions.d.ts
 export declare const coerceString: (value: unknown) => string | undefined;
 export declare const coerceNumber: (value: unknown) => number | undefined;
 export declare const coerceBoolean: (value: unknown) => boolean | undefined;
 export declare const coerceDate: (value: unknown) => Date | undefined;
 export declare const coerceSingular: <T>(value: T | Array<T>) => T | undefined;
-export declare const coerceArray: <T>(value: Nullish<T | Array<T>>) => Array<T>;
-//#endregion
+export declare const coerceArray: <T>(value: Nullish<T | Array<T>>) => Array<T>;

package/dist/coercions.js

@@ -1,5 +1,5 @@
 import { isBoolean, isNonEmptyString, isNullish, isNumber, isString, isValidDate } from "./is.js";
-//#region src/coercions.ts
+// src/coercions.ts
 const coerceString = (value) => {
 	if (isString(value)) return value;
 	if (isNumber(value)) return String(value);
@@ -36,5 +36,4 @@ const coerceArray = (value) => {
 	if (isNullish(value)) return [];
 	return Array.isArray(value) ? value : [value];
 };
-//#endregion
 export { coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString };

package/dist/files.d.ts

@@ -1,4 +1,3 @@
-//#region src/files.d.ts
 export declare const audioExtensions: string[];
 export declare const videoExtensions: string[];
 export declare const imageExtensions: string[];
@@ -8,5 +7,4 @@ export declare const installerExtensions: string[];
 export declare const flashExtensions: string[];
 export declare const codeExtensions: string[];
 export declare const fontExtensions: string[];
-export declare const subtitleExtensions: string[];
-//#endregion
+export declare const subtitleExtensions: string[];

package/dist/files.js

@@ -1,4 +1,4 @@
-//#region src/files.ts
+// src/files.ts
 const audioExtensions = [
 	"aac",
 	"aif",
@@ -97,5 +97,4 @@ const fontExtensions = [
 	"woff2"
 ];
 const subtitleExtensions = ["srt", "vtt"];
-//#endregion
 export { archiveExtensions, audioExtensions, codeExtensions, documentExtensions, flashExtensions, fontExtensions, imageExtensions, installerExtensions, subtitleExtensions, videoExtensions };

package/dist/is.d.ts

@@ -1,4 +1,3 @@
-//#region src/is.d.ts
 export declare const isString: (value: unknown) => value is string;
 export declare const isNumber: (value: unknown) => value is number;
 export declare const isBoolean: (value: unknown) => value is boolean;
@@ -8,5 +7,4 @@ export declare const isNullish: (value: unknown) => value is null | undefined;
 export declare const isObject: (value: unknown) => value is object;
 export declare const isPlainObject: (value: unknown) => value is Record<string, unknown>;
 export declare const isNonEmptyString: (value: unknown) => value is string;
-export declare const isValidDate: (value: unknown) => value is Date;
-//#endregion
+export declare const isValidDate: (value: unknown) => value is Date;

package/dist/is.js

@@ -1,4 +1,4 @@
-//#region src/is.ts
+// src/is.ts
 const isString = (value) => {
 	return typeof value === "string";
 };
@@ -33,5 +33,4 @@ const isNonEmptyString = (value) => {
 const isValidDate = (value) => {
 	return value instanceof Date && !Number.isNaN(value.getTime());
 };
-//#endregion
 export { isBoolean, isFunction, isNonEmptyString, isNullish, isNumber, isObject, isPlainObject, isPresent, isString, isValidDate };

package/dist/json.d.ts

@@ -1,4 +1,2 @@
-//#region src/json.d.ts
 export declare const isJsonLike: (value: string) => boolean;
-export declare const isParseableJson: (value: string) => boolean;
-//#endregion
+export declare const isParseableJson: (value: string) => boolean;

package/dist/json.js

@@ -1,4 +1,4 @@
-//#region src/json.ts
+// src/json.ts
 const isWhitespaceCode = (code) => {
 	return code >= 9 && code <= 13 || code === 32 || code === 160 || code === 5760 || code >= 8192 && code <= 8202 || code === 8232 || code === 8233 || code === 8239 || code === 8287 || code === 12288 || code === 65279;
 };
@@ -20,5 +20,4 @@ const isParseableJson = (value) => {
 		return false;
 	}
 };
-//#endregion
 export { isJsonLike, isParseableJson };

package/dist/locales.d.ts

@@ -1,5 +1,3 @@
-//#region src/locales.d.ts
 export declare const escapeHtml: (value: string) => string;
 export declare const t: (template: string, params: Record<string, string | number>) => string;
-export declare const tx: (template: string, params: Record<string, string | number>) => string;
-//#endregion
+export declare const tx: (template: string, params: Record<string, string | number>) => string;

package/dist/locales.js

@@ -1,4 +1,4 @@
-//#region src/locales.ts
+// src/locales.ts
 const placeholderRegex = /\{\{(\w+)\}\}/g;
 const escapableRegex = /[&<>"']/g;
 const escapeHtml = (value) => {
@@ -22,5 +22,4 @@ const tx = (template, params) => {
 		return Object.hasOwn(params, key) ? escapeHtml(String(params[key])) : placeholder;
 	});
 };
-//#endregion
 export { escapeHtml, t, tx };

package/dist/matching.d.ts

@@ -1,10 +1,8 @@
 import { Pattern } from "./types.js";
-//#region src/matching.d.ts
 export declare const escapeRegex: (value: string) => string;
 export declare const isAnyOf: (value: string | undefined, patterns: Pattern | ReadonlyArray<Pattern>, parser?: (value: string) => string) => boolean;
 export declare const getAnyOf: <T extends string>(value: string | undefined, patterns: ReadonlyArray<T>, parser?: (value: string) => string) => T | undefined;
-export declare const includesAnyOf: (value: string | undefined, patterns: ReadonlyArray<Pattern>, parser?: (value: string) => string) => boolean;
-export declare const startsWithAnyOf: (value: string, patterns: ReadonlyArray<Pattern>) => boolean;
-export declare const endsWithAnyOf: (value: string, patterns: ReadonlyArray<Pattern>) => boolean;
-export declare const anyWordMatchesAnyOf: (value: string, patterns: ReadonlyArray<Pattern>) => boolean;
-//#endregion
+export declare const includesAnyOf: (value: string | undefined, patterns: Pattern | ReadonlyArray<Pattern>, parser?: (value: string) => string) => boolean;
+export declare const startsWithAnyOf: (value: string | undefined, patterns: Pattern | ReadonlyArray<Pattern>) => boolean;
+export declare const endsWithAnyOf: (value: string | undefined, patterns: Pattern | ReadonlyArray<Pattern>) => boolean;
+export declare const anyWordMatchesAnyOf: (value: string, patterns: ReadonlyArray<Pattern>) => boolean;

package/dist/matching.js

@@ -1,5 +1,5 @@
 import { isNullish } from "./is.js";
-//#region src/matching.ts
+// src/matching.ts
 const whitespaceRegex = /\s+/;
 const regexSyntaxCharsRegex = /[.*+?^${}()|[\]\\/]/;
 const regexEscapableCharsRegex = /[.*+?^${}()|[\]\\/&!#%,:;<=>@`~-]/g;
@@ -10,6 +10,9 @@ const testRegex = (regex, value) => {
 const testRegexAnyCase = (regex, lowerValue, value) => {
 	return testRegex(regex, lowerValue) || lowerValue !== value && testRegex(regex, value);
 };
+const toPatternList = (patterns) => {
+	return typeof patterns === "string" || patterns instanceof RegExp ? [patterns] : patterns;
+};
 const escapeRegex = (value) => {
 	return value.replace(regexEscapableCharsRegex, (char) => {
 		if (regexSyntaxCharsRegex.test(char)) return `\\${char}`;
@@ -20,7 +23,7 @@ const isAnyOf = (value, patterns, parser) => {
 	if (isNullish(value)) return false;
 	const parsedValue = parser ? parser(value) : value.toLowerCase().trim();
 	const originalValue = parser ? parsedValue : value.trim();
-	return (typeof patterns === "string" || patterns instanceof RegExp ? [patterns] : patterns).some((pattern) => {
+	return toPatternList(patterns).some((pattern) => {
 		if (pattern instanceof RegExp) return testRegexAnyCase(pattern, parsedValue, originalValue);
 		return parsedValue === (parser ? pattern : pattern.toLowerCase().trim());
 	});
@@ -36,21 +39,23 @@ const includesAnyOf = (value, patterns, parser) => {
 	if (isNullish(value)) return false;
 	const parsedValue = parser ? parser(value) : value.toLowerCase();
 	const originalValue = parser ? parsedValue : value;
-	return patterns.some((pattern) => {
+	return toPatternList(patterns).some((pattern) => {
 		if (pattern instanceof RegExp) return testRegexAnyCase(pattern, parsedValue, originalValue);
 		return pattern && parsedValue.includes(parser ? pattern : pattern.toLowerCase());
 	});
 };
 const startsWithAnyOf = (value, patterns) => {
+	if (isNullish(value)) return false;
 	const lowerValue = value.toLowerCase();
-	return patterns.some((pattern) => {
+	return toPatternList(patterns).some((pattern) => {
 		if (pattern instanceof RegExp) return testRegexAnyCase(pattern, lowerValue, value);
 		return pattern && lowerValue.startsWith(pattern.toLowerCase());
 	});
 };
 const endsWithAnyOf = (value, patterns) => {
+	if (isNullish(value)) return false;
 	const lowerValue = value.toLowerCase();
-	return patterns.some((pattern) => {
+	return toPatternList(patterns).some((pattern) => {
 		if (pattern instanceof RegExp) return testRegexAnyCase(pattern, lowerValue, value);
 		return pattern && lowerValue.endsWith(pattern.toLowerCase());
 	});
@@ -74,5 +79,4 @@ const anyWordMatchesAnyOf = (value, patterns) => {
 	}
 	return false;
 };
-//#endregion
 export { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, getAnyOf, includesAnyOf, isAnyOf, startsWithAnyOf };

package/dist/mimes.d.ts

@@ -1,8 +1,6 @@
 import { WeightedMimeType } from "./types.js";
-//#region src/mimes.d.ts
 export declare const feedMimeTypes: Array<WeightedMimeType>;
 export declare const genericFeedMimeTypes: Array<WeightedMimeType>;
 export declare const htmlMimeTypes: Array<WeightedMimeType>;
 export declare const genericHtmlMimeTypes: Array<WeightedMimeType>;
-export declare const createAcceptHeader: (types: ReadonlyArray<WeightedMimeType>) => string;
-//#endregion
+export declare const createAcceptHeader: (types: ReadonlyArray<WeightedMimeType>) => string;

package/dist/mimes.js

@@ -1,4 +1,4 @@
-//#region src/mimes.ts
+// src/mimes.ts
 const feedMimeTypes = [
 	{
 		mime: "application/atom+xml",
@@ -99,5 +99,4 @@ const createAcceptHeader = (types) => {
 		return `${type.mime};q=${type.quality}`;
 	}).join(", ");
 };
-//#endregion
 export { createAcceptHeader, feedMimeTypes, genericFeedMimeTypes, genericHtmlMimeTypes, htmlMimeTypes };

package/dist/objects.d.ts

@@ -1,7 +1,5 @@
 import { AnyOf } from "./types.js";
-//#region src/objects.d.ts
 export declare const pick: <T extends object, K extends keyof T>(object: T, keys: ReadonlyArray<K>) => Pick<T, K>;
 export declare const omit: <T extends object, K extends keyof T>(object: T, keys: ReadonlyArray<K>) => Omit<T, K>;
 export declare const trimObject: <T extends Record<string, unknown>>(object: T, keep?: (value: unknown) => boolean) => AnyOf<T> | undefined;
-export declare const toMap: <V>(record: Record<string, V>) => Map<string, V>;
-//#endregion
+export declare const toMap: <V>(record: Record<string, V>) => Map<string, V>;

package/dist/objects.js

@@ -1,5 +1,5 @@
 import { isPresent } from "./is.js";
-//#region src/objects.ts
+// src/objects.ts
 const setKey = (object, key, value) => {
 	if (key === "__proto__") {
 		Object.defineProperty(object, key, {
@@ -42,5 +42,4 @@ const trimObject = (object, keep = isPresent) => {
 const toMap = (record) => {
 	return new Map(Object.entries(record));
 };
-//#endregion
 export { omit, pick, toMap, trimObject };

package/dist/timers.d.ts

@@ -1,3 +1 @@
-//#region src/timers.d.ts
-export declare const sleep: (milliseconds: number) => Promise<void>;
-//#endregion
+export declare const sleep: (milliseconds: number) => Promise<void>;

package/dist/timers.js

@@ -1,9 +1,8 @@
-//#region src/timers.ts
+// src/timers.ts
 const maxDelay = 2 ** 31 - 1;
 const sleep = (milliseconds) => {
 	return new Promise((resolve) => {
 		setTimeout(resolve, Math.min(milliseconds, maxDelay));
 	});
 };
-//#endregion
 export { sleep };

package/dist/types.d.ts

@@ -1,4 +1,3 @@
-//#region src/types.d.ts
 export type AnyOf<T> = Partial<{ [Key in keyof T]-?: NonNullable<T[Key]>; }> & { [Key in keyof T]-?: Pick<{ [InnerKey in keyof T]-?: NonNullable<T[InnerKey]>; }, Key>; }[keyof T];
 export type IsPlainObject<T> = T extends Array<unknown> ? false : T extends ((...args: Array<unknown>) => unknown) ? false : T extends Date ? false : T extends object ? T extends null ? false : true : false;
 export type DeepOmit<T, Keys extends string> = T extends Array<infer Item> ? Array<DeepOmit<Item, Keys>> : IsPlainObject<T> extends true ? Pick<{ [Key in keyof T]: DeepOmit<T[Key], Keys>; }, Exclude<keyof T, Keys>> : T;
@@ -31,5 +30,4 @@ export type NormalizeOptions = {
 export type WeightedMimeType = {
   mime: string;
   quality: number;
-};
-//#endregion
+};

package/dist/urls.d.ts

@@ -1,6 +1,5 @@
-import { NormalizeOptions, RegistrableDomainOptions } from "./types.js";
-//#region src/urls.d.ts
-export declare const parseUrl: (value: string | URL, base?: string | URL) => URL | undefined;
+import { NormalizeOptions, Nullish, 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;
 export declare const isSubdomainOf: (url: string | URL, domains: string | ReadonlyArray<string>) => boolean;
@@ -12,7 +11,7 @@ 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 composeQuery: (params?: Record<string, string>) => string;
+export declare const composeQuery: (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;
@@ -33,5 +32,4 @@ export declare const resolveFeedProtocol: typeof resolveFeedScheme;
 /** @deprecated Use `addMissingScheme` instead. */
 export declare const addMissingProtocol: typeof addMissingScheme;
 /** @deprecated Use `upgradeScheme` instead. */
-export declare const upgradeProtocol: typeof upgradeScheme;
-//#endregion
+export declare const upgradeProtocol: typeof upgradeScheme;

package/dist/urls.js

@@ -1,8 +1,10 @@
+import { isNullish } from "./is.js";
 import { endsWithAnyOf, isAnyOf } from "./matching.js";
 import { decodeHTMLStrict } from "entities";
-//#region src/urls.ts
+// src/urls.ts
 const httpSchemes = ["http:", "https:"];
 const parseUrl = (value, base) => {
+	if (isNullish(value)) return;
 	if (value instanceof URL && base === void 0) return value;
 	if (URL.parse) return URL.parse(value, base) ?? void 0;
 	try {
@@ -108,7 +110,7 @@ const composeQuery = (params) => {
 		return part.replace(queryPartEscapeRegex, (character) => encodeURIComponent(character));
 	};
 	const pairs = Object.entries(params ?? {}).map(([name, value]) => {
-		return `${escapePart(name)}=${escapePart(value)}`;
+		return `${escapePart(name)}=${escapePart(String(value))}`;
 	});
 	return pairs.length > 0 ? `?${pairs.join("&")}` : "";
 };
@@ -178,8 +180,13 @@ const fixMalformedScheme = (url) => {
 };
 const nestedUrlRegex = /[a-z][a-z\d+.-]*(?::|%3A)(?:\/\/|%2F%2F)|(?<=[=?&])(?:\/\/|%2F%2F)/i;
 const httpOrSchemeRelativeRegex = /^(?:https?:)?\/\//i;
+const slugTailRegex = /[/.-]/;
 const lostSeparatorRegex = /(?<!\s)\s+(?=[A-Za-z_][\w.-]*=)/g;
 const slashClosedValueRegex = /(=[^&/=]+)\/+(?=&|$)/g;
+const isGlueTail = (head, glueIndex, pathEnd) => {
+	const tail = head.slice(glueIndex + 1, pathEnd).split("&")[0] ?? "";
+	return tail.includes("=") || !slugTailRegex.test(tail);
+};
 const fixMalformedQuery = (url) => {
 	if (!httpOrSchemeRelativeRegex.test(url)) return url;
 	const hashIndex = url.indexOf("#");
@@ -195,7 +202,7 @@ const fixMalformedQuery = (url) => {
 	const pathIndex = head.indexOf("/", authorityEnd);
 	const pathEnd = hasMark ? markIndex : ownEnd;
 	const glueIndex = pathIndex !== -1 && pathIndex < pathEnd ? head.indexOf("&", pathIndex) : -1;
-	const isGlued = glueIndex !== -1 && glueIndex < pathEnd;
+	const isGlued = glueIndex !== -1 && glueIndex < pathEnd && isGlueTail(head, glueIndex, pathEnd);
 	if (!isGlued && !hasMark) return url;
 	const queryIndex = isGlued ? glueIndex : markIndex;
 	const queryStart = queryIndex + (isGlued && head[glueIndex + 1] === "?" ? 2 : 1);
@@ -282,9 +289,7 @@ const addMissingScheme = (url, scheme = "https") => {
 	if (relativeLeadChars.includes(url.charAt(0))) return url;
 	const slashIndex = url.indexOf("/");
 	const dotIndex = url.indexOf(".");
-	if (dotIndex === -1 || slashIndex !== -1 && dotIndex > slashIndex) {
-		if (!localhostRegex.test(url)) return url;
-	}
+	if (!(dotIndex !== -1 && (slashIndex === -1 || dotIndex < slashIndex)) && !localhostRegex.test(url)) return url;
 	const firstChar = url.charAt(0);
 	if (leadingWhitespaceChars.includes(firstChar)) return url;
 	return `${scheme}://${url}`;
@@ -509,5 +514,4 @@ const resolveFeedProtocol = resolveFeedScheme;
 const addMissingProtocol = addMissingScheme;
 /** @deprecated Use `upgradeScheme` instead. */
 const upgradeProtocol = upgradeScheme;
-//#endregion
 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 };

package/package.json

@@ -40,11 +40,11 @@
   },
   "devDependencies": {
     "@types/bun": "^1.4.2",
-    "kvalita": "^1.24.3",
-    "tsdown": "^0.23.0"
+    "kvalita": "^1.26.4",
+    "tsdown": "0.23.1"
   },
   "dependencies": {
     "entities": "^8.1.0"
   },
-  "version": "2.15.1"
+  "version": "2.16.1"
 }