trousse 2.7.0 → 2.9.0

package/dist/index.d.ts

@@ -1,12 +1,13 @@
 import { omitEmpty } from "./arrays.js";
-import { AnyOf, DeepOmit, IsPlainObject, MaybePromise, NormalizeOptions, Nullish, PartialNullish, Pattern, RegistrableDomainOptions } from "./types.js";
+import { AnyOf, DeepOmit, IsPlainObject, MaybePromise, NormalizeOptions, Nullish, PartialNullish, Pattern, RegistrableDomainOptions, WeightedMimeType } from "./types.js";
 import { coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString } from "./coercions.js";
 import { archiveExtensions, audioExtensions, codeExtensions, documentExtensions, flashExtensions, fontExtensions, imageExtensions, installerExtensions, subtitleExtensions, videoExtensions } from "./files.js";
 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, getAnyOf, includesAnyOf, isAnyOf, startsWithAnyOf } from "./matching.js";
+import { createAcceptHeader, feedMimeTypes, genericFeedMimeTypes, genericHtmlMimeTypes, htmlMimeTypes } from "./mimes.js";
 import { omit, pick, toMap, trimObject } from "./objects.js";
 import { sleep } from "./timers.js";
 import { addMissingProtocol, addMissingScheme, decodeSegment, fixMalformedProtocol, fixMalformedScheme, getPathSegments, getRegistrableDomain, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, resolveFeedProtocol, resolveFeedScheme, resolveUrl, stripWww, upgradeProtocol, upgradeScheme } from "./urls.js";
-export { type AnyOf, type DeepOmit, type IsPlainObject, type MaybePromise, type NormalizeOptions, type Nullish, type PartialNullish, type Pattern, type RegistrableDomainOptions, addMissingProtocol, addMissingScheme, anyWordMatchesAnyOf, archiveExtensions, audioExtensions, codeExtensions, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, decodeSegment, documentExtensions, endsWithAnyOf, escapeHtml, escapeRegex, fixMalformedProtocol, fixMalformedScheme, flashExtensions, fontExtensions, getAnyOf, getPathSegments, getRegistrableDomain, getSubdomain, imageExtensions, includesAnyOf, installerExtensions, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, normalizeUrl, omit, omitEmpty, parseUrl, pick, resolveFeedProtocol, resolveFeedScheme, resolveUrl, sleep, startsWithAnyOf, stripWww, subtitleExtensions, t, toMap, trimObject, tx, upgradeProtocol, upgradeScheme, videoExtensions };
+export { type AnyOf, type DeepOmit, type IsPlainObject, type MaybePromise, type NormalizeOptions, type Nullish, type PartialNullish, type Pattern, type RegistrableDomainOptions, type WeightedMimeType, addMissingProtocol, addMissingScheme, anyWordMatchesAnyOf, archiveExtensions, audioExtensions, codeExtensions, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, createAcceptHeader, decodeSegment, documentExtensions, endsWithAnyOf, escapeHtml, escapeRegex, feedMimeTypes, fixMalformedProtocol, fixMalformedScheme, flashExtensions, fontExtensions, genericFeedMimeTypes, genericHtmlMimeTypes, getAnyOf, getPathSegments, getRegistrableDomain, getSubdomain, htmlMimeTypes, imageExtensions, includesAnyOf, installerExtensions, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, normalizeUrl, omit, omitEmpty, parseUrl, pick, resolveFeedProtocol, resolveFeedScheme, resolveUrl, sleep, startsWithAnyOf, stripWww, subtitleExtensions, t, toMap, trimObject, tx, upgradeProtocol, upgradeScheme, videoExtensions };

package/dist/index.js

@@ -5,7 +5,8 @@ import { archiveExtensions, audioExtensions, codeExtensions, documentExtensions,
 import { isJsonLike, isParseableJson } from "./json.js";
 import { escapeHtml, t, tx } from "./locales.js";
 import { anyWordMatchesAnyOf, endsWithAnyOf, escapeRegex, getAnyOf, includesAnyOf, isAnyOf, startsWithAnyOf } from "./matching.js";
+import { createAcceptHeader, feedMimeTypes, genericFeedMimeTypes, genericHtmlMimeTypes, htmlMimeTypes } from "./mimes.js";
 import { omit, pick, toMap, trimObject } from "./objects.js";
 import { sleep } from "./timers.js";
 import { addMissingProtocol, addMissingScheme, decodeSegment, fixMalformedProtocol, fixMalformedScheme, getPathSegments, getRegistrableDomain, getSubdomain, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, resolveFeedProtocol, resolveFeedScheme, resolveUrl, stripWww, upgradeProtocol, upgradeScheme } from "./urls.js";
-export { addMissingProtocol, addMissingScheme, anyWordMatchesAnyOf, archiveExtensions, audioExtensions, codeExtensions, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, decodeSegment, documentExtensions, endsWithAnyOf, escapeHtml, escapeRegex, fixMalformedProtocol, fixMalformedScheme, flashExtensions, fontExtensions, getAnyOf, getPathSegments, getRegistrableDomain, getSubdomain, imageExtensions, includesAnyOf, installerExtensions, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, normalizeUrl, omit, omitEmpty, parseUrl, pick, resolveFeedProtocol, resolveFeedScheme, resolveUrl, sleep, startsWithAnyOf, stripWww, subtitleExtensions, t, toMap, trimObject, tx, upgradeProtocol, upgradeScheme, videoExtensions };
+export { addMissingProtocol, addMissingScheme, anyWordMatchesAnyOf, archiveExtensions, audioExtensions, codeExtensions, coerceArray, coerceBoolean, coerceDate, coerceNumber, coerceSingular, coerceString, createAcceptHeader, decodeSegment, documentExtensions, endsWithAnyOf, escapeHtml, escapeRegex, feedMimeTypes, fixMalformedProtocol, fixMalformedScheme, flashExtensions, fontExtensions, genericFeedMimeTypes, genericHtmlMimeTypes, getAnyOf, getPathSegments, getRegistrableDomain, getSubdomain, htmlMimeTypes, imageExtensions, includesAnyOf, installerExtensions, isAnyOf, isBoolean, isFunction, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isJsonLike, isNonEmptyString, isNullish, isNumber, isObject, isParseableJson, isPlainObject, isPresent, isString, isSubdomainOf, isValidDate, normalizeUrl, omit, omitEmpty, parseUrl, pick, resolveFeedProtocol, resolveFeedScheme, resolveUrl, sleep, startsWithAnyOf, stripWww, subtitleExtensions, t, toMap, trimObject, tx, upgradeProtocol, upgradeScheme, videoExtensions };

package/dist/mimes.d.ts

@@ -0,0 +1,8 @@
+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

package/dist/mimes.js

@@ -0,0 +1,103 @@
+//#region src/mimes.ts
+const feedMimeTypes = [
+	{
+		mime: "application/atom+xml",
+		quality: 1
+	},
+	{
+		mime: "application/rss+xml",
+		quality: 1
+	},
+	{
+		mime: "application/feed+json",
+		quality: 1
+	},
+	{
+		mime: "application/rdf+xml",
+		quality: 1
+	},
+	{
+		mime: "application/rss",
+		quality: .9
+	},
+	{
+		mime: "text/rss",
+		quality: .9
+	},
+	{
+		mime: "text/rss+xml",
+		quality: .9
+	},
+	{
+		mime: "application/x-rss+xml",
+		quality: .9
+	},
+	{
+		mime: "application/atom",
+		quality: .9
+	},
+	{
+		mime: "application/x.atom+xml",
+		quality: .9
+	},
+	{
+		mime: "application/x-atom+xml",
+		quality: .9
+	},
+	{
+		mime: "text/atom+xml",
+		quality: .9
+	},
+	{
+		mime: "text/atom",
+		quality: .9
+	},
+	{
+		mime: "text/rdf",
+		quality: .9
+	},
+	{
+		mime: "text/rdf+xml",
+		quality: .9
+	}
+];
+const genericFeedMimeTypes = [
+	{
+		mime: "application/xml",
+		quality: .8
+	},
+	{
+		mime: "text/xml",
+		quality: .8
+	},
+	{
+		mime: "application/json",
+		quality: .8
+	},
+	{
+		mime: "text/plain",
+		quality: .1
+	}
+];
+const htmlMimeTypes = [{
+	mime: "text/html",
+	quality: 1
+}, {
+	mime: "application/xhtml+xml",
+	quality: 1
+}];
+const genericHtmlMimeTypes = [{
+	mime: "application/xml",
+	quality: .9
+}, {
+	mime: "*/*",
+	quality: .8
+}];
+const createAcceptHeader = (types) => {
+	return types.map((type) => {
+		if (type.quality === 1) return type.mime;
+		return `${type.mime};q=${type.quality}`;
+	}).join(", ");
+};
+//#endregion
+export { createAcceptHeader, feedMimeTypes, genericFeedMimeTypes, genericHtmlMimeTypes, htmlMimeTypes };

package/dist/types.d.ts

@@ -13,6 +13,7 @@ export type NormalizeOptions = {
   stripScheme?: boolean;
   /** @deprecated Use `stripScheme` instead, which wins when both are set. */
   stripProtocol?: boolean;
+  stripHostTrailingDot?: boolean;
   stripAuthentication?: boolean;
   stripWww?: boolean;
   stripTrailingSlash?: boolean;
@@ -27,4 +28,8 @@ export type NormalizeOptions = {
   normalizeEncoding?: boolean;
   normalizeUnicode?: boolean;
 };
+export type WeightedMimeType = {
+  mime: string;
+  quality: number;
+};
 //#endregion

package/dist/urls.js

@@ -68,7 +68,7 @@ const getStrippedParamsSet = (params) => {
 };
 const ipv4Regex = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/;
 const ipv6Regex = /^([0-9a-f]{0,4}:){2,7}[0-9a-f]{0,4}$/i;
-const wwwPrefixRegex = /^www\./;
+const wwwPrefixRegex = /^(?:www\.)+(?=.*\.)/;
 const ipv6BracketsRegex = /^\[|\]$/g;
 const unreservedCharsRegex = /[a-zA-Z0-9._~-]/;
 const httpsLetterRegex = /s/i;
@@ -94,7 +94,7 @@ 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 doubledSchemeRegex = /* @__PURE__ */ new RegExp(String.raw`^\/?[htps]{2,7}${leadingSchemeSeparator}([htps]{2,7})(?!:\d)(${schemeSeparator})[.,:/]*(www[./]+)?`, "i");
+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) => {
 	const lowered = token.toLowerCase();
@@ -225,6 +225,7 @@ const lowercaseQueryPair = (pair) => {
 const normalizeUrl = (url, options) => {
 	try {
 		const parsed = new URL(options.normalizeUnicode ? url.normalize("NFC") : url);
+		if (options.stripHostTrailingDot && parsed.hostname.endsWith(".")) parsed.hostname = parsed.hostname.slice(0, -1);
 		if (options.stripAuthentication) {
 			parsed.username = "";
 			parsed.password = "";
@@ -259,8 +260,7 @@ const normalizeUrl = (url, options) => {
 	}
 };
 const stripWww = (hostname) => {
-	const stripped = hostname.replace(wwwPrefixRegex, "");
-	return stripped.includes(".") ? stripped : hostname;
+	return hostname.replace(wwwPrefixRegex, "");
 };
 const isIpAddress = (hostname) => {
 	return ipv4Regex.test(hostname) || ipv6Regex.test(hostname.replace(ipv6BracketsRegex, ""));

package/package.json

@@ -46,5 +46,5 @@
   "dependencies": {
     "entities": "^8.1.0"
   },
-  "version": "2.7.0"
+  "version": "2.9.0"
 }