trousse 2.7.0 → 2.8.0

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;

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.8.0"
 }