trousse 2.2.1 → 2.4.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,8 +1,9 @@
 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 includesAnyOf: (value: string, patterns: ReadonlyArray<Pattern>, parser?: (value: string) => string) => boolean;
+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;

package/dist/matching.js

@@ -1,3 +1,4 @@
+import { isNullish } from "./is.js";
 //#region src/matching.ts
 const whitespaceRegex = /\s+/;
 const regexMetaCharsRegex = /[.*+?^${}()|[\]\\-]/g;
@@ -5,17 +6,24 @@ const escapeRegex = (value) => {
 	return value.replace(regexMetaCharsRegex, "\\$&");
 };
 const isAnyOf = (value, patterns, parser) => {
-	const parsedValue = parser ? parser(value) : value?.toLowerCase()?.trim();
-	return patterns.some((pattern) => {
+	if (isNullish(value)) return false;
+	const parsedValue = parser ? parser(value) : value.toLowerCase().trim();
+	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) => {
+	if (isNullish(value)) return;
+	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();
+	if (isNullish(value)) return false;
+	const parsedValue = parser ? parser(value) : value.toLowerCase();
 	return patterns.some((pattern) => {
 		if (pattern instanceof RegExp) return pattern.test(parsedValue);
-		return pattern && parsedValue?.includes(pattern.toLowerCase());
+		return pattern && parsedValue.includes(pattern.toLowerCase());
 	});
 };
 const startsWithAnyOf = (value, patterns) => {
@@ -45,4 +53,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

@@ -13,7 +13,7 @@ const getPathSegments = (value) => {
 const isHostOf = (url, hosts) => {
 	const hostname = parseUrl(url)?.hostname;
 	if (!hostname) return false;
-	return isAnyOf(hostname, typeof hosts === "string" ? [hosts] : hosts);
+	return isAnyOf(hostname, hosts);
 };
 const isSubdomainOf = (url, domains) => {
 	const hostname = parseUrl(url)?.hostname;

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.1"
+  "version": "2.4.0"
 }