trousse 2.1.0 → 2.2.1

package/dist/index.d.ts

@@ -7,5 +7,5 @@ import { escapeHtml, t, tx } from "./locales.js";
 import { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, includesAnyOf, isAnyOf, startsWithAnyOf } from "./matching.js";
 import { omit, pick, toMap, trimObject } from "./objects.js";
 import { sleep } from "./timers.js";
-import { getPathSegments, isHostOf, 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, endsWithAnyOf, escapeHtml, escapeRegex, getPathSegments, includesAnyOf, isAnyOf, isBoolean, isFunction, isHostOf, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, omit, omitEmpty, parseUrl, pick, sleep, startsWithAnyOf, t, toMap, trimObject, tx };
+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 };

package/dist/index.js

@@ -6,5 +6,5 @@ import { escapeHtml, t, tx } from "./locales.js";
 import { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, includesAnyOf, isAnyOf, startsWithAnyOf } from "./matching.js";
 import { omit, pick, toMap, trimObject } from "./objects.js";
 import { sleep } from "./timers.js";
-import { getPathSegments, isHostOf, isSubdomainOf, parseUrl } from "./urls.js";
-export { anyWordMatchesAnyOf, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, endsWithAnyOf, escapeHtml, escapeRegex, getPathSegments, includesAnyOf, isAnyOf, isBoolean, isFunction, isHostOf, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, omit, omitEmpty, parseUrl, pick, sleep, startsWithAnyOf, t, toMap, trimObject, tx };
+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 };

package/dist/urls.d.ts

@@ -3,4 +3,8 @@ export declare const parseUrl: (value: string | URL, base?: string | URL) => URL
 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;
+export declare const isHttpUrl: (url: string | URL) => boolean;
+export declare const isHostOrSubdomainOf: (url: string | URL, domains: string | ReadonlyArray<string>) => boolean;
+export declare const getSubdomain: (url: string | URL, domains: string | ReadonlyArray<string>) => string | undefined;
+export declare const decodeSegment: (segment: string | undefined) => string | undefined;
 //#endregion

package/dist/urls.js

@@ -1,5 +1,6 @@
 import { endsWithAnyOf, isAnyOf } from "./matching.js";
 //#region src/urls.ts
+const httpProtocols = ["http:", "https:"];
 const parseUrl = (value, base) => {
 	if (value instanceof URL && base === void 0) return value;
 	try {
@@ -19,5 +20,28 @@ const isSubdomainOf = (url, domains) => {
 	if (!hostname) return false;
 	return endsWithAnyOf(hostname, (typeof domains === "string" ? [domains] : domains).map((domain) => `.${domain}`));
 };
+const isHttpUrl = (url) => {
+	const protocol = parseUrl(url)?.protocol;
+	if (!protocol) return false;
+	return httpProtocols.includes(protocol);
+};
+const isHostOrSubdomainOf = (url, domains) => {
+	return isHostOf(url, domains) || isSubdomainOf(url, domains);
+};
+const getSubdomain = (url, domains) => {
+	const hostname = parseUrl(url)?.hostname.toLowerCase();
+	if (!hostname) return;
+	const list = typeof domains === "string" ? [domains] : domains;
+	for (const domain of list) {
+		const suffix = `.${domain.toLowerCase()}`;
+		if (hostname.endsWith(suffix) && hostname.length > suffix.length) return hostname.slice(0, -suffix.length);
+	}
+};
+const decodeSegment = (segment) => {
+	if (segment === void 0) return;
+	try {
+		return decodeURIComponent(segment);
+	} catch {}
+};
 //#endregion
-export { getPathSegments, isHostOf, isSubdomainOf, parseUrl };
+export { decodeSegment, getPathSegments, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isSubdomainOf, parseUrl };

package/package.json

@@ -40,5 +40,5 @@
     "kvalita": "^1.21.0",
     "tsdown": "^0.23.0"
   },
-  "version": "2.1.0"
+  "version": "2.2.1"
 }