trousse 2.2.0 → 2.3.0

package/dist/index.d.ts

@@ -4,8 +4,8 @@ import { coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, c
 import { isBoolean, isFunction, isNonEmptyString, isNullish, isNumber, isObject, isPlainObject, isPresent, isString, isValidDate } from "./is.js";
 import { isJsonLike, isParseableJson } from "./json.js";
 import { escapeHtml, t, tx } from "./locales.js";
-import { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, includesAnyOf, isAnyOf, startsWithAnyOf } from "./matching.js";
+import { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, getAnyOf, includesAnyOf, isAnyOf, startsWithAnyOf } from "./matching.js";
 import { omit, pick, toMap, trimObject } from "./objects.js";
 import { sleep } from "./timers.js";
 import { decodeSegment, getPathSegments, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isSubdomainOf, parseUrl } from "./urls.js";
-export { type AnyOf, type DeepOmit, type IsPlainObject, type MaybePromise, type Nullish, type PartialNullish, type Pattern, anyWordMatchesAnyOf, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, decodeSegment, endsWithAnyOf, escapeHtml, escapeRegex, getPathSegments, getSubdomain, includesAnyOf, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, omit, omitEmpty, parseUrl, pick, sleep, startsWithAnyOf, t, toMap, trimObject, tx };
+export { type AnyOf, type DeepOmit, type IsPlainObject, type MaybePromise, type Nullish, type PartialNullish, type Pattern, anyWordMatchesAnyOf, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, decodeSegment, endsWithAnyOf, escapeHtml, escapeRegex, getAnyOf, getPathSegments, getSubdomain, includesAnyOf, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, omit, omitEmpty, parseUrl, pick, sleep, startsWithAnyOf, t, toMap, trimObject, tx };

package/dist/index.js

@@ -3,8 +3,8 @@ import { omitEmpty } from "./arrays.js";
 import { coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString } from "./coercions.js";
 import { isJsonLike, isParseableJson } from "./json.js";
 import { escapeHtml, t, tx } from "./locales.js";
-import { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, includesAnyOf, isAnyOf, startsWithAnyOf } from "./matching.js";
+import { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, getAnyOf, includesAnyOf, isAnyOf, startsWithAnyOf } from "./matching.js";
 import { omit, pick, toMap, trimObject } from "./objects.js";
 import { sleep } from "./timers.js";
 import { decodeSegment, getPathSegments, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isSubdomainOf, parseUrl } from "./urls.js";
-export { anyWordMatchesAnyOf, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, decodeSegment, endsWithAnyOf, escapeHtml, escapeRegex, getPathSegments, getSubdomain, includesAnyOf, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, omit, omitEmpty, parseUrl, pick, sleep, startsWithAnyOf, t, toMap, trimObject, tx };
+export { anyWordMatchesAnyOf, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, decodeSegment, endsWithAnyOf, escapeHtml, escapeRegex, getAnyOf, getPathSegments, getSubdomain, includesAnyOf, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, omit, omitEmpty, parseUrl, pick, sleep, startsWithAnyOf, t, toMap, trimObject, tx };

package/dist/matching.d.ts

@@ -1,7 +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, patterns: ReadonlyArray<Pattern>, parser?: (value: string) => string) => boolean;
+export declare const isAnyOf: (value: string, patterns: Pattern | ReadonlyArray<Pattern>, parser?: (value: string) => string) => boolean;
+export declare const getAnyOf: <T extends string>(value: string, patterns: ReadonlyArray<T>, parser?: (value: string) => string) => T | undefined;
 export declare const includesAnyOf: (value: string, 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;

package/dist/matching.js

@@ -6,11 +6,15 @@ const escapeRegex = (value) => {
 };
 const isAnyOf = (value, patterns, parser) => {
 	const parsedValue = parser ? parser(value) : value?.toLowerCase()?.trim();
-	return patterns.some((pattern) => {
+	return (typeof patterns === "string" || patterns instanceof RegExp ? [patterns] : patterns).some((pattern) => {
 		if (pattern instanceof RegExp) return pattern.test(parsedValue);
 		return parsedValue === pattern.toLowerCase().trim();
 	});
 };
+const getAnyOf = (value, patterns, parser) => {
+	const parsedValue = parser ? parser(value) : value?.toLowerCase()?.trim();
+	return patterns.find((pattern) => parsedValue === pattern.toLowerCase().trim());
+};
 const includesAnyOf = (value, patterns, parser) => {
 	const parsedValue = parser ? parser(value) : value?.toLowerCase();
 	return patterns.some((pattern) => {
@@ -45,4 +49,4 @@ const anyWordMatchesAnyOf = (value, patterns) => {
 	return false;
 };
 //#endregion
-export { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, includesAnyOf, isAnyOf, startsWithAnyOf };
+export { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, getAnyOf, includesAnyOf, isAnyOf, startsWithAnyOf };

package/dist/urls.js

@@ -29,7 +29,7 @@ const isHostOrSubdomainOf = (url, domains) => {
 	return isHostOf(url, domains) || isSubdomainOf(url, domains);
 };
 const getSubdomain = (url, domains) => {
-	const hostname = parseUrl(url)?.hostname;
+	const hostname = parseUrl(url)?.hostname.toLowerCase();
 	if (!hostname) return;
 	const list = typeof domains === "string" ? [domains] : domains;
 	for (const domain of list) {

package/package.json

@@ -30,15 +30,18 @@
   "files": [
     "dist"
   ],
+  "engines": {
+    "node": ">=18"
+  },
   "scripts": {
     "prepare": "lefthook install",
     "build": "tsdown src/index.ts --format esm --dts --clean --unbundle --no-fixed-extension",
     "test": "bun test"
   },
   "devDependencies": {
-    "@types/bun": "^1.4.1",
-    "kvalita": "^1.21.0",
+    "@types/bun": "^1.4.2",
+    "kvalita": "^1.24.0",
     "tsdown": "^0.23.0"
   },
-  "version": "2.2.0"
+  "version": "2.3.0"
 }