trousse 2.15.0 → 2.16.0

package/dist/matching.d.ts

@@ -3,8 +3,8 @@ import { Pattern } from "./types.js";
 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 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;
 //#endregion

package/dist/matching.js

@@ -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());
 	});

package/dist/urls.d.ts

@@ -1,6 +1,6 @@
-import { NormalizeOptions, RegistrableDomainOptions } from "./types.js";
+import { NormalizeOptions, Nullish, RegistrableDomainOptions } from "./types.js";
 //#region src/urls.d.ts
-export declare const parseUrl: (value: string | URL, base?: string | URL) => URL | undefined;
+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 +12,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;

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
 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("&")}` : "";
 };
@@ -150,7 +152,8 @@ const schemeColonRegex = /^[^/]*:/;
 const missingColonSchemeRegex = /^https?[\s=.\\]*\/\//i;
 const validUrlRegex = /^https?:\/\/(?:www\.|[a-vx-z0-9])/i;
 const schemeSeparator = String.raw`\.*[:\s=\\/][:\s=.\\/]*`;
-const leadingSchemeSeparator = String.raw`\.*(?::[:\s=.\\/]*|[\s=\\/][:\s=.\\/]+)`;
+const separatorChar = String.raw`(?:[:\s=.\\/]|%20|%c2%a0)`;
+const leadingSchemeSeparator = String.raw`\.*(?::${separatorChar}*|[\s=\\/]${separatorChar}+)`;
 const doubledSchemeRegex = /* @__PURE__ */ new RegExp(String.raw`^\/?[htps]{2,7}${leadingSchemeSeparator}([htps]{2,7})(?!:\d|[^/?#\\]*@)(${schemeSeparator})[.,:/]*(www[./]+)?`, "i");
 const singleMalformedRegex = /* @__PURE__ */ new RegExp(String.raw`^\/?(h[htps():]{1,10}|t{1,2}ps?)(${leadingSchemeSeparator})[.,:/]*(www[./]+)?`, "i");
 const isSchemeToken = (token, separator) => {

package/package.json

@@ -46,5 +46,5 @@
   "dependencies": {
     "entities": "^8.1.0"
   },
-  "version": "2.15.0"
+  "version": "2.16.0"
 }